defaulted new parameters in modified functions
compile issues, resolve later.  commiting because switching machines