updated for new info