Some more changes made