Same comment as above: these 2 promises need factorizing.