Fixed and updated with the latest changes