working on updated structure