Final changes done ...