base plus extras for avoiding build cancelled error