rob shops fix and more position saving.