Yupp now behind a feature switch