Final Version and Fix on 2