Integrated JT's improved eye detection
fixing conflicts