Changed some minor changes