Level modified to better integrate with the LevelHandler
Resolved merge conflict