changes on master by hassan