Updated with some of Parth's stuff