Improved horse edit