Final changes added