merging in important changes