A few changes I somehow made.