include improvement from JuMi2006. THX