pushing some changes following experimentation