lots of changes/improvements, change to workflow