updated to support NEW PLUG