rebalance
removed hardcode
changed places
hand bug fix (it could appear in a wrong place after restart)