moar changes to the program