Big UFO Changes

Also reverting the 360 changes - unintended side-effects