@xplore: changes made