Is this easier if we do #21
Is this easier if we do #21