updated improvements from workmachine