this is some awkward stuff; I think how you had it was way cleaner