changes to accommodate multiple plugins
remove test code