codes synchronization with minor changes