Some more  changes