worked on new save mechanism (3)