again - simplify the pattern matching