committing eran's changes