moving over to case types system
fixed match proc bug