Updated Version and Documentation