Few changes code might not work, RIght now