updating for new stuff and switching sources