Added Cup Functionality