updated final version for finals week!!!!