New cup fill/empty switch