saving now not duplicating, tidy formatting