previous implementation did not take into account configurability,
relying solely on the non-representative demo