Applied the latest changes