Changing how EntryNumber works