Some  changes