Updates to get a working full match