Save location to record
Remove step prefix check for now