Swarit's changes - 6/11/2013