faizan's changes 25/3/14