Updated the latest files after resolving the issues