Replaced form with self.save function