added a bit, grabbing jason's mostly