Added conditional showing raw hatches