Rework of sokoban