diff --git a/message_server/sfp_ms.go b/message_server/sfp_ms.go
index baaef0a..204493e 100644
--- a/message_server/sfp_ms.go
+++ b/message_server/sfp_ms.go
@@ -35,10 +35,10 @@ func NewSfpMs(vs *memory.VerifySimulation, mapId int32) ms_api.MsgTask {
 		if err != nil {
 			return err
 		}
-		buttonStates, err := collectStationButtonStates(vs.World, mapId)
-		if err != nil {
-			return err
-		}
+		//buttonStates, err := collectStationButtonStates(vs.World, mapId)
+		//if err != nil {
+		//	return err
+		//}
 		psdStates, err := collectPsdStates(vs.World, mapId)
 		if err != nil {
 			return err
@@ -74,10 +74,10 @@ func NewSfpMs(vs *memory.VerifySimulation, mapId int32) ms_api.MsgTask {
 		ststes := &state_proto.PushedDevicesStatus{
 			All: true,
 			AllStatus: &state_proto.AllDevicesStatus{
-				TrainState:    trainState,
-				SwitchState:   turnoutStates,
-				SignalState:   signalStates,
-				ButtonState:   buttonStates,
+				TrainState:  trainState,
+				SwitchState: turnoutStates,
+				SignalState: signalStates,
+				//ButtonState:   buttonStates,
 				PsdState:      psdStates,
 				SectionState:  sectionStates,
 				PlatformState: platformStates,
diff --git a/ts/simulation/wayside/memory/wayside_simulation.go b/ts/simulation/wayside/memory/wayside_simulation.go
index e309ec2..6e061eb 100644
--- a/ts/simulation/wayside/memory/wayside_simulation.go
+++ b/ts/simulation/wayside/memory/wayside_simulation.go
@@ -1318,6 +1318,14 @@ func fillProtoRepository(repo *proto.Repository, storage *data_proto.RtssGraphic
 			Id:   uidsMap.PlatformIds[platformId].Uid,
 			Code: data.Code,
 		}
+		switch data.Type {
+		case data_proto.Platform_up:
+			platform.Direction = proto.Platform_Up
+		case data_proto.Platform_down:
+			platform.Direction = proto.Platform_Down
+		case data_proto.Platform_Unknown:
+			platform.Direction = proto.Platform_Unknown
+		}
 		repo.Platforms = append(repo.Platforms, platform)
 		platform.StationId = uidsMap.StationIds[data.RefStationId].Uid
 		platform.PhysicalSectionId = uidsMap.PhysicalSectionIds[data.RefSectionId].Uid
@@ -1417,7 +1425,7 @@ func fillProtoRepository(repo *proto.Repository, storage *data_proto.RtssGraphic
 		repo.Spkss = append(repo.Spkss, &proto.Spks{
 			Id:         uidsMap.SpksIds[data.Common.Id].Uid,
 			Code:       data.Code,
-			PlatformId: uidsMap.StationIds[data.RefStand].Uid,
+			PlatformId: uidsMap.PlatformIds[data.RefStand].Uid,
 		})
 	}
 }