updates to conform to new 'my makes' system