lots of changes on trombone
more changes from trombone