Incomplete - task : Make existed code right