add in forgotten changes  (merge this)