Adding shortMatch code