same changes as demo branch for tidier list