Some more changes but not done