Committing Andrei's changes