Probably can squash all this inside the first (good) scenario?