merge gavin and ismail's changes