Made come minor changes