#updated structure