Missed something in merge, also, moon handling