could we just do this in the other setup up around line 49?