Knew there was a better way