Update code For resovling issues