I'll make this atomic