Update 1

code more simple than before