Made workshop specific changes