updated for all new external repos