nicer cup detection
merged