updated for 3rd edition stuff.