First workshop initial changes