working on save issue