Should have done this earlier