Few updated and changes