trying to merge with nathans changes