updated structure, refs