further changtes to the workshop tool