3rd commit transfer changes so can run on laptop