some more changes done