Much better now, should have just done this the first time..