cleaned up config, extended z01-function