Include Jason Schmidt's recommended changes