update with newer proposed changes