Workshop finished, version 2.0r