Removed limit of matching only from start