Made changes Jared recommended