Made Final changes