Should of added this from the beginning