Updated with auto-elevation code