synchronization with Ivan's changes