Merged in Cheaty Stuff (path, building)