Update code and coment