New workshop layout