align the var line under andreas supervision
improve the civi side of things