Improve latest patch