Return instead of commit