some more changes committed as a result changes mention in email