get rid of wrong philip roberts
merge changes