Change order of operations
Add record_standby_location(), fixes