Feature/case check