minor changes back