Updated with the latest patch