lots of changes to process