Fixed Nick Pfeufer's Failures