Reverted changes to main and maze