fixed or, added more cases