<Murugan> Updated some more code