diff --git a/common/movement.tf b/common/movement.tf
index dfbfd48..cdff08f 100644
--- a/common/movement.tf
+++ b/common/movement.tf
@@ -220,38 +220,25 @@
     /status_edit -r2 sneak:4:C%{c_alarm} %;\
   /endif
 
-/def hidenum = \
-  /set hideshow %{1}%;\
-  /status_edit -r1 hideshow:4:C%c_alarm
-/def hidecountstart = \
-  /rstart -1 1 /hidenum >>1%;\
-  /rstart -2 1 /hidenum >>2%;\
-  /rstart -3 1 /hidenum >>3%;\
-  /rstart -4 1 /hidenum >>4%;\
-  /rstart -5 1 /hidenum >>5%;\
-  /rstart -6 1 /hidenum >>6%;\
-  /rstart -7 1 /hidenum >>7%;\
-  /rstart -8 1 /hidenum >>8%;\
-  /rstart -9 1 /hidenum >>9%;\
-  /rstart -10 1 /hidenum >10%;\
-  /rstart -11 1 /hidenum >11%;\
-  /rstart -12 1 /hidenum >12%;\
-  /rstart -13 1 /hidenum >13%;\
-  /rstart -14 1 /hidenum >14%;\
-  /rstart -15 1 /hidenum >15%;\
+/def hideup = \
+  /if ({hideshow} < "15" )\
+    /test ++hideshow%;\
+    /status_edit -r1 hideshow:4:C%c_alarm%;\
+    /repeat -1 1 /hideup %;\
+  /endif
 
 /def hide = \
   /if ( {1} =~ "off" ) \
     /set hide %{1} %;\
     /set hideshow %{1} %;\
     /status_edit -r1 hideshow:4:C%{c_main} %;\
-    /rstop hidenum %;\
+    /rstop hideup %;\
   /elseif ( {1} =~ "on" ) \
     /set hide %{1} %;\
     /set hideshow 0%;\
     /status_edit -r1 hideshow:4:C%{c_alarm} %;\
-    /rstop hidenum %;\
-    /hidecountstart %;\
+    /rstop hideup %;\
+    /repeat -1 1 /hideup %;\
   /endif
 
 /def -mregexp -Fp2 -t'Chowasz sie .* potrafisz' hideon0 = /hide on