More changes in accordance with Dan's reccomendation