new format
moved to plugin system