diff --git a/src/components/floor-plan/modal/basic/step/Orientation.jsx b/src/components/floor-plan/modal/basic/step/Orientation.jsx
index 59ff4f37..6dcadde8 100644
--- a/src/components/floor-plan/modal/basic/step/Orientation.jsx
+++ b/src/components/floor-plan/modal/basic/step/Orientation.jsx
@@ -66,12 +66,12 @@ export const Orientation = forwardRef((props, ref) => {
   useEffect(() => {
     if (selectedSurfaceType) {
       console.log(roughnessCodes, selectedSurfaceType)
-      setInputRoughness(roughnessCodes.find((code) => code.clCode === moduleSelectionData.common.illuminationTp))
+      setInputRoughness(roughnessCodes.find((code) => code.clCode === managementState?.surfaceTypeValue))
     }
   }, [selectedSurfaceType])
 
   useEffect(() => {
-    if (standardWindSpeed) setInputStandardWindSpeed(windSpeedCodes.find((code) => code.clCode === moduleSelectionData.common.stdWindSpeed))
+    if (standardWindSpeed) setInputStandardWindSpeed(windSpeedCodes.find((code) => code.clCode === managementState?.standardWindSpeedId))
   }, [standardWindSpeed])
 
   useEffect(() => {
@@ -181,11 +181,35 @@ export const Orientation = forwardRef((props, ref) => {
   }
 
   const handleChangeModule = (e) => {
+    resetRoofs()
+    setSelectedModules(e)
+  }
+
+  const handleChangeRoughness = (e) => {
+    resetRoofs()
+    setInputRoughness(e)
+  }
+
+  const handleChangeInstallHeight = (e) => {
+    resetRoofs()
+    setInputInstallHeight(e)
+  }
+
+  const handleChangeStandardWindSpeed = (e) => {
+    resetRoofs()
+    setInputStandardWindSpeed(e)
+  }
+
+  const handleChangeVerticalSnowCover = (e) => {
+    resetRoofs()
+    setInputVerticalSnowCover(e)
+  }
+
+  const resetRoofs = () => {
     const newRoofs = addedRoofs.map((roof) => {
       return {
         ...roof,
         lengthBase: null,
-        raftBaseCd: null,
         trestleMkrCd: null,
         constMthdCd: null,
         constTp: null,
@@ -201,7 +225,6 @@ export const Orientation = forwardRef((props, ref) => {
       }
     })
     setRoofs(newRoofs)
-    setSelectedModules(e)
   }
 
   return (
@@ -359,10 +382,7 @@ export const Orientation = forwardRef((props, ref) => {
                             targetKey={'clCode'}
                             sourceKey={'clCode'}
                             showKey={'clCodeNm'}
-                            onChange={(e) => {
-                              console.log('🚀 ~ handleChangeModule ~ inputRoughness:', e)
-                              setInputRoughness(e)
-                            }}
+                            onChange={(e) => handleChangeRoughness(e)}
                           />
                         )}
                       </div>
@@ -374,7 +394,7 @@ export const Orientation = forwardRef((props, ref) => {
                           type="text"
                           className="input-origin block"
                           value={inputInstallHeight}
-                          onChange={(e) => setInputInstallHeight(e.target.value)}
+                          onChange={(e) => handleChangeInstallHeight(e.target.value)}
                         />
                       </div>
                       <span className="thin">m</span>
@@ -390,10 +410,7 @@ export const Orientation = forwardRef((props, ref) => {
                             targetKey={'clCode'}
                             sourceKey={'clCode'}
                             showKey={'clCodeNm'}
-                            onChange={(e) => {
-                              console.log('🚀 ~ handleChangeModule ~ inputStandardWindSpeed:', e)
-                              setInputStandardWindSpeed(e)
-                            }}
+                            onChange={(e) => handleChangeStandardWindSpeed(e)}
                           />
                         )}
                       </div>
@@ -405,7 +422,7 @@ export const Orientation = forwardRef((props, ref) => {
                           type="text"
                           className="input-origin block"
                           value={inputVerticalSnowCover}
-                          onChange={(e) => setInputVerticalSnowCover(e.target.value)}
+                          onChange={(e) => handleChangeVerticalSnowCover(e.target.value)}
                         />
                       </div>
                       <span className="thin">cm</span>