separated resume code, pushing probably final changes