worked on new save mechanism