this is more generic now, not plugins anymore... same for the lines below