diff --git a/src/sys/vmm/paging.c b/src/sys/vmm/paging.c
index c627f36..65ef2d9 100755
--- a/src/sys/vmm/paging.c
+++ b/src/sys/vmm/paging.c
@@ -42,8 +42,9 @@
            Also Note I May Switch The Page Fault To A Task Gate.
 
 07/30/02 - I Decided That To Save On Performance All Page Tables Will Be
-           Mapped In At E0000000 So That Memory Does Not Need To Be Relocated
+           Mapped In At BFC00000 So That Memory Does Not Need To Be Relocated
            To Alter Page Tables.
+           Also Put Page Index At 0xC0000000
            
 ************************************************************************/
 void initPagingSystem() {
@@ -67,7 +68,7 @@
     pageTable[i] = (uLong)((i*0x1000) | pageDefault);
     }
   //Create Page Tables For The Top 1GB Of VM Space This Is To Be Shared With All VM Spaces
-  for (i=768;i<pageEntries;i++) {
+  for (i=767;i<pageEntries;i++) {
     pageTable = (uLong *)allocPage();
     //Make Sure The Page Table Is Clean
     for (x=0;x<pageEntries;x++) {
@@ -77,13 +78,13 @@
     kernelPageDirectory[i] = (uLong)((uLong)(pageTable) | pageDefault);
     }
   //Set Up Memory At E0000000 To Be All The Allocated Page Directories
-  pageTable = (uLong *)(kernelPageDirectory[896] & 0xFFFFF000);
+  pageTable = (uLong *)(kernelPageDirectory[767] & 0xFFFFF000);
   for (i=0;i<pageEntries;i++) {
     pageTable[i] = kernelPageDirectory[i];
     }
   //Also Set Up Page Directory To Be The The First Page In 0xE0400000
-  pageTable = (uLong *)(kernelPageDirectory[897] & 0xFFFFF000);
-  pageTable[0] = (uLong)(0x300000 | pageDefault);
+  pageTable = (uLong *)(kernelPageDirectory[768] & 0xFFFFF000);
+  pageTable[0] = (uLong)((uLong)(kernelPageDirectory) | pageDefault);
   //Now Lets Turn On Paging With This Initial Page Table
   asm(
     "movl %0,%%eax          \n"
@@ -102,41 +103,6 @@
   memoryMap = (mMap *)0xE6667000;
   }                           
 
-/*
-void initPaging() {
-  int i=0,x=0;
-  uLong *pageTable;
-  int freePage = 0x0;
-  memoryStart += (numPages * 8);
-  pageDirectory = (uLong *)memoryStart;
-  memoryStart += 4096;
-  for (i=0;i<pageLength;i++) {
-    pageDirectory[i] = 0x0;
-    }
-  for (x=0;x<memoryStart;x+=0x400000) {
-    pageTable = (unsigned long *)memoryStart;
-    memoryStart += 4096;
-    pageDirectory[x/0x400000] = (uLong)pageTable | pageDefault;
-    for (i=0;i<1024;i++) {
-      pageTable[i] = 0x0;
-      }
-    for (i=0;i<1024;i++) {
-      pageTable[i] = freePage | 7;
-      freePage += 0x1000;
-      }
-    }
-  asm(
-    "movl %0,%%eax          \n"
-    "movl %%eax,%%cr3       \n"
-    "movl %%cr0,%%eax       \n"
-    "orl  $0x80010000,%%eax \n"
-    "movl %%eax,%%cr0       \n"
-    : : "d" ((uLong *)(pageDirectory))
-    );
-  setVector(_pageFault,14,dPresent + dInt + dDpl3);
-  }
-*/
-
 void *getFreePage() {
   short x=0,y=0;
   uLong *pageTableSrc = 0x0;
@@ -172,19 +138,22 @@
 
 07/29/02 - Rewrote This To Work With Our New Paging System
 
+07/30/02 - Changed Address Of Page Tables And Page Directory
+
 ************************************************************************/  
 void remapPage(uLong source,uLong dest) {
   uShort destPageDirectoryIndex=0,destPageTableIndex=0;
   uLong *pageDir,*pageTable;
-//  uInt spi=0,spage=0,dpi=0,dpage=0;
-//  uLong *srcPagetable,*dstPagetable,*pageDir;
   //Set Pointer pageDirectory To Point To The Virtual Mapping Of The Page Directory
-  pageDir = (uLong *)0xE0400000;
+  pageDir = (uLong *)0xC0000000;
   //Check To See If Page Table Exists
   destPageDirectoryIndex = (dest/(1024*4096));
   if (pageDir[destPageDirectoryIndex] == 0) {
     //If Page Table Is Non Existant Then Set It Up
     pageDir[destPageDirectoryIndex] = (uLong)allocPage() | pageDefault;
+    //Also Add It To Virtual Space So We Can Make Changes Later
+    pageTable = (uLong *)(0xBFC00000 + (4096 * 767));
+    pageTable[destPageDirectoryIndex] = pageDir[destPageDirectoryIndex];
     //Reload Page Directory
     asm(
       "movl %cr3,%eax\n"
@@ -192,7 +161,7 @@
       );
     }
   //Set Address To Page Table
-  pageTable = (uLong *)(0xE0000000 + (4096 * destPageDirectoryIndex));    
+  pageTable = (uLong *)(0xBFC00000 + (4096 * destPageDirectoryIndex));    
   //Get The Index To The Page Table
   destPageTableIndex = ((dest-(destPageDirectoryIndex*(1024*4096)))/4096);
   //Set The Source Address In The Destination