updated for plugin v 0.0.16