last version before demo - data api code commented out