changes suggested by my advisor and more sources