+fix code (Final version 1.1)