updates for additional work
mostly copied over from old work