why oh why cant this be easy
fixed silly merge error