oops missed some !'s... fixed