succesful rewrite with new variables
Merge branch 'master' of ssh://github.com/meawoppl/circulation