Add full logic without regexp