Swarit's changes