Made the changes Sangar suggested