Eliminated double save in controllers