Brought initial changes back