made minor changes so that main would run