Add crosshair support
Fix merge