Updated factory
to delete