Syncing Andrei's changes