finalized functionality for 0.8.0-alpha release