Yes, changed to using the object, syntax gets a little messy.