updated and consolidated resume logic
Merge branch 'dev'