move match with to original syntax
move function syntax to original