Swarit's changes - 5/11/2013