Some more changes done