fixing up code since assemble has changed in the last 9 months