Final changes to UFO