add new classes + more synchronized