Add return and safetyheight... thingies