updates per argyle
updated and fixed merge