Fixed to align with new demo app