further tweaking + added function to pull single form