Making changes to altitude, branch is currently a mess