Maze improved