verify Eric's 5d180
merge