some changes
making it a little easier to run