fixing commitment issues...