several changes done