Reverted some changes
And reverted all back