more changes done