added funcitionality (documentation pending)