Final changes done