be more strict about downloading and resolving