more restructuring + event.getinfo call