Added position saving