adding in kyles fixes

fixed conditional routing