[#198][#199][finished] modified code