Updated version of Maze from 2/25/14