Added '' conditions