add latest changes (June workshop finished)