Fixed what I broke with davids stuff