Added changes for TLB use, nothing fancy yet.