backup little changes before converting to class