Committing part of broken version