updated for new lightweight data format