work in progress
use released version
cleanup