Merge with old exercises