straighting up
additional changes for setting up