synced with version 1.2