Added more explicit conditions