Did lots of changes to allow process to work