fixed the or operator to ensure both function are called first