Modifier recognition

Finally finally finally!