more variable / function changes