updated for new stuff