Updated Version and removed some more functions.