added return/enter for creation