added || instead of or