Scoping and some changes. Possible bad change to cup. Check history