Changes done

Done with changes