basket patch v1 (draft)