Swarit's changes - Latest2