Should have done this from the beginning