added differentiator beween translation/rotation
new patterns and stuff