Added variable to also work for distribution