added cahnges from master