pushing plugin functionality further...