This was unnecessarily complicated