I knew there was a better way of doing it!