Should reuse this in the create too