r5

Cleaned up click detection