Index: main/kofacustom.lpng/trunk/etc/site.zcml.in
===================================================================
--- main/kofacustom.lpng/trunk/etc/site.zcml.in	(revision 17250)
+++ main/kofacustom.lpng/trunk/etc/site.zcml.in	(revision 17254)
@@ -1,4 +1,5 @@
 <configure xmlns="http://namespaces.zope.org/zope"
            xmlns:kofa="http://namespaces.waeup.org/kofa"
+           xmlns:kofacustomng="http://namespaces.waeup.org/kofacustomng"
            i18n_domain="kofacustom.lpng">
 
@@ -28,4 +29,8 @@
   <kofa:datacenter
       path="${buildout:directory}/var/datacenter" />
+
+  <!-- Where can the paypal config be found -->
+  <kofacustomng:paypalconf
+      path="${buildout:directory}/etc/paypal.conf" />
 
     <configure i18n_domain="kofacustom.lpng">
Index: main/kofacustom.lpng/trunk/src/kofacustom/lpng/applicants/browser.py
===================================================================
--- main/kofacustom.lpng/trunk/src/kofacustom/lpng/applicants/browser.py	(revision 17250)
+++ main/kofacustom.lpng/trunk/src/kofacustom/lpng/applicants/browser.py	(revision 17254)
@@ -26,5 +26,5 @@
     FriendlyDatetimeDisplayWidget)
 from waeup.kofa.applicants.pdf import PDFApplicationSlip
-from waeup.kofa.browser.layout import KofaEditFormPage, KofaPage, action
+from waeup.kofa.browser.layout import KofaEditFormPage, KofaPage, action, NullValidator
 from waeup.kofa.applicants.browser import (
     ApplicantRegistrationPage, ApplicantsContainerPage,
@@ -214,4 +214,29 @@
     grok.require('waeup.payApplicant')
     
+    @action(_('Create ticket'), style='primary')
+    def createTicket(self, **data):
+        p_category = data['p_category']
+        form = self.request.form
+        p_option = form.get('form.p_option', None)
+        balance_amount = data.get('balance_amount', None)
+        applicants_utils = getUtility(IApplicantsUtils)
+        error, payment = applicants_utils.setBalanceDetails(
+            self.context, p_category, balance_amount)
+        if error is not None:
+            self.flash(error, type="danger")
+            return
+        if p_option:
+            payment.p_option = p_option
+            payment.p_currency = p_option
+        self.context[payment.p_id] = payment
+        self.flash(_('Payment ticket created.'))
+        self.context.writeLogMessage(self,'added: %s' % payment.p_id)
+        self.redirect(self.url(payment))
+        return
+
+    @action(_('Cancel'), validator=NullValidator)
+    def cancel(self, **data):
+        self.redirect(self.url(self.context))
+
 class CustomApplicantBaseDisplayFormPage(ApplicantBaseDisplayFormPage):
 
Index: main/kofacustom.lpng/trunk/src/kofacustom/lpng/applicants/punits.csv
===================================================================
--- main/kofacustom.lpng/trunk/src/kofacustom/lpng/applicants/punits.csv	(revision 17250)
+++ main/kofacustom.lpng/trunk/src/kofacustom/lpng/applicants/punits.csv	(revision 17254)
@@ -1588,5 +1588,5 @@
 s1,l6,w3,u1,Okpuala/Amawom/Achara-Eziala Mkt Square
 s1,l6,w3,u2,Umuelu/Ogbuga/Umundukwe/Umuagu-Central Sch Eziala
-s1,l6,w3,u3,Umuomaikwu/Eluama/Amaiyi/Umuikpaba Communityschool Umuomaikwu
+s1,l6,w3,u3,Umuomaikwu/Eluama/Amaiyi/Umuikpaba CommunitySchool Umuomaikwu
 s1,l6,w3,u4,Umuezegu-Village Square Umuezegu
 s1,l6,w3,u5,Umuala-Umuala Nsulu Central School
@@ -3599,5 +3599,5 @@
 s1,l15,w7,u8,Ugwunchara/Oboro/Asaba/Oji River Street
 s1,l15,w7,u9,Awkuzu/Awolowo-Ugwunchara Primary School
-s1,l15,w7,u10,Udi/Oji River Jnr Girls Sec school
+s1,l15,w7,u10,Udi/Oji River Jnr Girls Sec School
 s1,l15,w7,u11,Uwalaka/Uzuakoli Road-Junior Girls Secondary School
 s1,l15,w7,u12,Junior Secondary School Ngwa/Asaba-Junior Girls Secondary School
@@ -36738,11 +36738,11 @@
 s9,l6,w10,u1,"Primary School, Ikot Okpora"
 s9,l6,w10,u2,"Village Square, Ikot Obo Isamo"
-s9,l6,w10,u3,"Primary Kschool, Ayaba"
+s9,l6,w10,u3,"Primary KSchool, Ayaba"
 s9,l6,w10,u4,"Village Square, Ikot Anakaniyom"
 s9,l6,w10,u5,Crel Village Square
 s9,l6,w10,u6,Primary School Ikot Ana
-s9,l6,w10,u7,"Primary Lschool, Ikot Ewo"
+s9,l6,w10,u7,"Primary LSchool, Ikot Ewo"
 s9,l6,w10,u8,"Primary School, Akpasip"
-s9,l6,w10,u9,"Primary Lschool, Bechei"
+s9,l6,w10,u9,"Primary LSchool, Bechei"
 s9,l6,w10,u10,"Primary School, Ugbem"
 s9,l6,w10,u11,"Primary School, Ufut"
@@ -44874,5 +44874,5 @@
 s10,l25,w4,u39,Ediabu-Maprimary School
 s10,l25,w4,u40,Jones Creek Town Hall
-s10,l25,w4,u41,Ogono-Ebijor Zion Primaryschool
+s10,l25,w4,u41,Ogono-Ebijor Zion PrimarySchool
 s10,l25,w4,u42,Ayasafaghan 1 &2 Town Hall
 s10,l25,w4,u43,Tumanu/Bobgbene/Lugbene Town Hall
@@ -51986,5 +51986,5 @@
 s12,l15,w8,u6,"Ikoka I, Esigie P/School I"
 s12,l15,w8,u7,"Ikoka II, Esigie P/School (Adebayo) II"
-s12,l15,w8,u8,"Agbonbayemwen, Akenzua P/SchooL"
+s12,l15,w8,u8,"Agbonbayemwen, Akenzua P/School"
 s12,l15,w8,u9,"Iguobanor, Iguobanor Village"
 s12,l15,w8,u10,"Aden, Aden River P/School"
@@ -53385,7 +53385,7 @@
 s13,l5,w7,u11,Olanipekun/At St. Peters School
 s13,l5,w8,u1,Sapetu Area/Near Sapetu
-s13,l5,w8,u2,Adebu/Olowofela/At St. James school
-s13,l5,w8,u3,Adebu/Olowofela/At St. Andrewsschool
-s13,l5,w8,u4,Elemo Are/At St. Jamesschool
+s13,l5,w8,u2,Adebu/Olowofela/At St. James School
+s13,l5,w8,u3,Adebu/Olowofela/At St. AndrewsSchool
+s13,l5,w8,u4,Elemo Are/At St. JamesSchool
 s13,l5,w8,u5,Elemo Are/Near Elemos House
 s13,l5,w8,u6,Sapetu/Igesa/At St. Johns School
@@ -53395,5 +53395,5 @@
 s13,l5,w8,u10,Oremeji/At St. Johns School
 s13,l5,w8,u11,Okeolua/At St. Andrews School
-s13,l5,w8,u12,Itaporogun/At St. James school
+s13,l5,w8,u12,Itaporogun/At St. James School
 s13,l5,w8,u13,At Toluwani Nursery Pry. School/Toluwani Pry. School
 s13,l5,w8,u14,Aro Balofin Near Aro
@@ -53404,10 +53404,10 @@
 s13,l5,w8,u19,Petu/Oniya Comp At Coop Store
 s13,l5,w8,u20,Petu/Oniya Comp./At St. Peters School
-s13,l5,w8,u21,Asebiomo/Ariyo/At St. Petersschool
+s13,l5,w8,u21,Asebiomo/Ariyo/At St. PetersSchool
 s13,l5,w8,u22,Owode Area/At L. A. Pry. School
 s13,l5,w8,u23,Olokun Comp./At Cocoa Hall At Idiuja I
 s13,l5,w8,u24,Olokun Comp./At Cocoa Hall At Idiuja II
-s13,l5,w8,u25,Agbele Comp./At St. Marksschool
-s13,l5,w8,u26,Obirokodo C/St. Jamesschool
+s13,l5,w8,u25,Agbele Comp./At St. MarksSchool
+s13,l5,w8,u26,Obirokodo C/St. JamesSchool
 s13,l5,w8,u27,"Elejoka Odigbo, St. James School"
 s13,l5,w9,u1,"Bolorunduro Farm/Primary School, Bolorunduro I"
@@ -54094,5 +54094,5 @@
 s13,l10,w10,u14,"Ilutuntun, Health Centre Afao/ Kajola"
 s13,l10,w10,u15,African Church Comprehensive High School
-s13,l10,w10,u16,"Ilupeju Primary Nschool Behinde, Ado Garage"
+s13,l10,w10,u16,"Ilupeju Primary NSchool Behinde, Ado Garage"
 s13,l10,w10,u17,Open Space At Obasanjo Estate Junction/ Fagbohun
 s13,l10,w11,u1,Post Office Bus Stop - Saya /Post Office Ereja
@@ -54372,5 +54372,5 @@
 s13,l12,w9,u5,"Osolo, In Front Of Mr. Ekundayos House I"
 s13,l12,w9,u6,"Osolo, In Front Of Mr. Ekundayos House II"
-s13,l12,w9,u7,Amechicommunityschool(Royalcomprehensivecollege) (Orie Market Square)
+s13,l12,w9,u7,AmechicommunitySchool(Royalcomprehensivecollege) (Orie Market Square)
 s13,l12,w9,u8,"Oke Okin I, In Front Of Chief Oguntifas House"
 s13,l12,w9,u9,"Oke Okin II, In Front Of Oguntifas House"
@@ -54511,9 +54511,9 @@
 s13,l13,w9,u16,Open Space At Odo-Odo Area
 s13,l13,w9,u17,"Open Space At Maternity, Ijafin"
-s13,l13,w9,u18,"Muslim Nursery And Primaryschool, Ijafin"
+s13,l13,w9,u18,"Muslim Nursery And PrimarySchool, Ijafin"
 s13,l13,w9,u19,Front Of Gabriel Egunlusishouse
 s13,l13,w9,u20,Front Of Coker Ologuntoyeshouse
 s13,l13,w9,u21,Open Space At Isaba
-s13,l13,w9,u22,Ifelodun Nursery & Primaryschool
+s13,l13,w9,u22,Ifelodun Nursery & PrimarySchool
 s13,l13,w10,u1,Petus Compound - Petu Compound
 s13,l13,w10,u2,Balogun Compound - Elera Area
@@ -55157,5 +55157,5 @@
 s14,l2,w1,u23,Amulo Ogboli Square
 s14,l2,w1,u24,Olovu Achu Ndiagu Ogboli Village Square
-s14,l2,w2,u1,Joint Oschool Amofia
+s14,l2,w2,u1,Joint OSchool Amofia
 s14,l2,w2,u2,Comm. School Onoli I
 s14,l2,w2,u3,Comm. School Onoli II
@@ -57664,5 +57664,5 @@
 s14,l12,w1,u13,Station Primary School Agbani II
 s14,l12,w1,u14,Community Secondary School Agbani
-s14,l12,w1,u15,Allins Commercial Kschool Agbani
+s14,l12,w1,u15,Allins Commercial KSchool Agbani
 s14,l12,w1,u16,"Central School, Agbani II"
 s14,l12,w1,u17,Umuonwe Village Hall Agbani
@@ -59177,5 +59177,5 @@
 s15,l1,w5,u5,Tupa/Tupa Primary School
 s15,l1,w5,u6,Rimba Gwari/Rimba Gwari Village Square
-s15,l1,w5,u7,Ebagi/Ebagi Primaryschool
+s15,l1,w5,u7,Ebagi/Ebagi PrimarySchool
 s15,l1,w5,u8,Naharati Sabo Primary Shool
 s15,l1,w5,u9,Naharati Sabo Primary Shool
@@ -59742,5 +59742,5 @@
 s15,l2,w10,u79,Kubwa Model Market Settlement
 s15,l3,w1,u1,Dagiri I/Infront Of Village Heads House
-s15,l3,w1,u2,Dagiri II/Dagiri Primary school
+s15,l3,w1,u2,Dagiri II/Dagiri Primary School
 s15,l3,w1,u3,Dagiri III/In Front Of Venus House
 s15,l3,w1,u4,sabon-Gari I/Demonstration Pri. sch.
@@ -59750,30 +59750,30 @@
 s15,l3,w1,u8,ung. Basa II/Infront Of Tankos House
 s15,l3,w1,u9,ung. Dodo/Infront Of Wards Heads House
-s15,l3,w1,u10,ung. Dodo/ung. Dodo Primary school
+s15,l3,w1,u10,ung. Dodo/ung. Dodo Primary School
 s15,l3,w1,u11,Dagiri By Madam Mercy Road Open space.
 s15,l3,w1,u12,Dagiri By Madam Mercy Road Open space.
 s15,l3,w1,u13,Dagiri By Madam Mercy Road Open space.
 s15,l3,w1,u14,Dagiri By Madam Mercy Road Open space.
-s15,l3,w1,u15,Timber shade Lea Primary school
-s15,l3,w1,u16,Dagiri II/Dagiri Primary school
-s15,l3,w1,u17,Dagiri II/Dagiri Primary school
-s15,l3,w1,u18,Dagiri II/Dagiri Primary school
-s15,l3,w1,u19,Dagiri II/Dagiri Primary school
-s15,l3,w1,u20,Dagiri II/Dagiri Primary school
+s15,l3,w1,u15,Timber shade Lea Primary School
+s15,l3,w1,u16,Dagiri II/Dagiri Primary School
+s15,l3,w1,u17,Dagiri II/Dagiri Primary School
+s15,l3,w1,u18,Dagiri II/Dagiri Primary School
+s15,l3,w1,u19,Dagiri II/Dagiri Primary School
+s15,l3,w1,u20,Dagiri II/Dagiri Primary School
 s15,l3,w1,u21,Dagiri III By Venus Road Open space
 s15,l3,w1,u22,Dagiri III By Venus Road Open space
 s15,l3,w1,u23,Dagiri III By Venus Road Open space
-s15,l3,w1,u24,Dagiri/Lea Primary school Timber
-s15,l3,w1,u25,sabon Gari I/Demonstration Primary school
-s15,l3,w1,u26,sabon Gari I/Demonstration Primary school
-s15,l3,w1,u27,sabon Gari I/Demonstration Primary school
-s15,l3,w1,u28,sabon Gari I/Demonstration Primary school
-s15,l3,w1,u29,sabon Gari I/Demonstration Primary school
-s15,l3,w1,u30,sabon Gari I/Demonstration Primary school
-s15,l3,w1,u31,sabon Gari II/Demonstration Primary school
-s15,l3,w1,u32,sabon Gari II/Demonstration Primary school
-s15,l3,w1,u33,sabon Gari II/Demonstration Primary school
-s15,l3,w1,u34,sabon Gari II/Demonstration Primary school
-s15,l3,w1,u35,sabon Gari II/Demonstration Primary school
+s15,l3,w1,u24,Dagiri/Lea Primary School Timber
+s15,l3,w1,u25,sabon Gari I/Demonstration Primary School
+s15,l3,w1,u26,sabon Gari I/Demonstration Primary School
+s15,l3,w1,u27,sabon Gari I/Demonstration Primary School
+s15,l3,w1,u28,sabon Gari I/Demonstration Primary School
+s15,l3,w1,u29,sabon Gari I/Demonstration Primary School
+s15,l3,w1,u30,sabon Gari I/Demonstration Primary School
+s15,l3,w1,u31,sabon Gari II/Demonstration Primary School
+s15,l3,w1,u32,sabon Gari II/Demonstration Primary School
+s15,l3,w1,u33,sabon Gari II/Demonstration Primary School
+s15,l3,w1,u34,sabon Gari II/Demonstration Primary School
+s15,l3,w1,u35,sabon Gari II/Demonstration Primary School
 s15,l3,w1,u36,Angwan Bassa/Police station Open space
 s15,l3,w1,u37,Angwan Bassa/Police station Open space
@@ -59787,15 +59787,15 @@
 s15,l3,w1,u45,Jss Angwan Dodo
 s15,l3,w1,u46,Jss Angwan Dodo
-s15,l3,w1,u47,Angwan Dodo Primary school
-s15,l3,w1,u48,unguwan Dodo I Primary school
-s15,l3,w1,u49,unguwan Dodo I Primary school
-s15,l3,w1,u50,Angwan Dodo Primary school
-s15,l3,w1,u51,Angwan Dodo Primary school
-s15,l3,w1,u52,Angwan Dodo Primary school
-s15,l3,w1,u53,Angwan Dodo Primary school
-s15,l3,w1,u54,Angwan Dodo Primary school
-s15,l3,w1,u55,Angwan Dodo Primary school
-s15,l3,w1,u56,Angwan Dodo Primary school
-s15,l3,w2,u1,Kutunku I/Primary school
+s15,l3,w1,u47,Angwan Dodo Primary School
+s15,l3,w1,u48,unguwan Dodo I Primary School
+s15,l3,w1,u49,unguwan Dodo I Primary School
+s15,l3,w1,u50,Angwan Dodo Primary School
+s15,l3,w1,u51,Angwan Dodo Primary School
+s15,l3,w1,u52,Angwan Dodo Primary School
+s15,l3,w1,u53,Angwan Dodo Primary School
+s15,l3,w1,u54,Angwan Dodo Primary School
+s15,l3,w1,u55,Angwan Dodo Primary School
+s15,l3,w1,u56,Angwan Dodo Primary School
+s15,l3,w2,u1,Kutunku I/Primary School
 s15,l3,w2,u2,Kutunku II/Women Centre
 s15,l3,w2,u3,ung. Fulani I/Health Clinic
@@ -59804,19 +59804,19 @@
 s15,l3,w2,u6,ung. Jeshi I Infront Of Chiefs House
 s15,l3,w2,u7,ung. Gade/Kofar Gidan sarki
-s15,l3,w2,u8,Kutunku I/Primary school
-s15,l3,w2,u9,Kutunku I/Primary school
-s15,l3,w2,u10,Kutunku I/Primary school
-s15,l3,w2,u11,Kutunku I/Primary school
-s15,l3,w2,u12,Kutunku I/Primary school
-s15,l3,w2,u13,Kutunku I/Primary school
-s15,l3,w2,u14,Kutunku I/Primary school
-s15,l3,w2,u15,Kutunku I/Primary school
-s15,l3,w2,u16,Kutunku III Lea Primary school
-s15,l3,w2,u17,Kutunku III Lea Primary school Kutunku III
-s15,l3,w2,u18,Kutunku I Lea Model Islamiya school
-s15,l3,w2,u19,ube Primary school Kutunku II
-s15,l3,w2,u20,ube Primary school Kutunku II
-s15,l3,w2,u21,ube Primary school Kutunku II
-s15,l3,w2,u22,ube Primary school Kutunku II
+s15,l3,w2,u8,Kutunku I/Primary School
+s15,l3,w2,u9,Kutunku I/Primary School
+s15,l3,w2,u10,Kutunku I/Primary School
+s15,l3,w2,u11,Kutunku I/Primary School
+s15,l3,w2,u12,Kutunku I/Primary School
+s15,l3,w2,u13,Kutunku I/Primary School
+s15,l3,w2,u14,Kutunku I/Primary School
+s15,l3,w2,u15,Kutunku I/Primary School
+s15,l3,w2,u16,Kutunku III Lea Primary School
+s15,l3,w2,u17,Kutunku III Lea Primary School Kutunku III
+s15,l3,w2,u18,Kutunku I Lea Model Islamiya School
+s15,l3,w2,u19,ube Primary School Kutunku II
+s15,l3,w2,u20,ube Primary School Kutunku II
+s15,l3,w2,u21,ube Primary School Kutunku II
+s15,l3,w2,u22,ube Primary School Kutunku II
 s15,l3,w2,u23,Kutunku IV Lea Abattoir
 s15,l3,w2,u24,Kutunku IV Lea Abattoir
@@ -59824,9 +59824,9 @@
 s15,l3,w2,u26,Kutunku II Women Centre
 s15,l3,w2,u27,Frsc Office Kutunku II Open space
-s15,l3,w2,u28,Abattoir Kutunku IV Lea Primary school
+s15,l3,w2,u28,Abattoir Kutunku IV Lea Primary School
 s15,l3,w2,u29,Radio House Area Open space
 s15,l3,w2,u30,Radio House Area Open space
-s15,l3,w2,u31,ube Primary school Kutunku II
-s15,l3,w2,u32,ube Primary school Kutunku II
+s15,l3,w2,u31,ube Primary School Kutunku II
+s15,l3,w2,u32,ube Primary School Kutunku II
 s15,l3,w2,u33,Angwan Fulani I/Health Clinic Open space
 s15,l3,w2,u34,Angwan Fulani I/Health Clinic Open space
@@ -59849,15 +59849,15 @@
 s15,l3,w3,u6,Phase III A/Behind university Of Abuja
 s15,l3,w3,u7,Phase III B/Phase III Pri. sch.
-s15,l3,w3,u8,Kontagora New Housing Estate Primary school
-s15,l3,w3,u9,Phase I/Gado Nasko Primary school
-s15,l3,w3,u10,Phase I/Gado Nasko Primary school
-s15,l3,w3,u11,Phase I/Gado Nasko Primary school
-s15,l3,w3,u12,Phase I/Gado Nasko Primary school
-s15,l3,w3,u13,Phase I/Lea Islamiya Primary school
-s15,l3,w3,u14,Phase I/Lea Islamiya Primary school
-s15,l3,w3,u15,Phase I/B&C Gado Nasko Primary school
-s15,l3,w3,u16,Phase I/B&C Gado Nasko Primary school
-s15,l3,w3,u17,Phase I/B&C Gado Nasko Primary school
-s15,l3,w3,u18,Phase I/B&C Gado Nasko Primary school
+s15,l3,w3,u8,Kontagora New Housing Estate Primary School
+s15,l3,w3,u9,Phase I/Gado Nasko Primary School
+s15,l3,w3,u10,Phase I/Gado Nasko Primary School
+s15,l3,w3,u11,Phase I/Gado Nasko Primary School
+s15,l3,w3,u12,Phase I/Gado Nasko Primary School
+s15,l3,w3,u13,Phase I/Lea Islamiya Primary School
+s15,l3,w3,u14,Phase I/Lea Islamiya Primary School
+s15,l3,w3,u15,Phase I/B&C Gado Nasko Primary School
+s15,l3,w3,u16,Phase I/B&C Gado Nasko Primary School
+s15,l3,w3,u17,Phase I/B&C Gado Nasko Primary School
+s15,l3,w3,u18,Phase I/B&C Gado Nasko Primary School
 s15,l3,w3,u19,Phase II/university Gate Open space
 s15,l3,w3,u20,Phase II/university Gate Open space
@@ -59866,10 +59866,10 @@
 s15,l3,w3,u23,Phase II A/university Gate Open space
 s15,l3,w3,u24,Phase II A/university Gate Open space
-s15,l3,w3,u25,Phase III Primary school
-s15,l3,w3,u26,Phase III Primary school
-s15,l3,w3,u27,Phase III Primary school
-s15,l3,w3,u28,Phase III Primary school
-s15,l3,w3,u29,Phase III Primary school
-s15,l3,w3,u30,Phase III Primary school
+s15,l3,w3,u25,Phase III Primary School
+s15,l3,w3,u26,Phase III Primary School
+s15,l3,w3,u27,Phase III Primary School
+s15,l3,w3,u28,Phase III Primary School
+s15,l3,w3,u29,Phase III Primary School
+s15,l3,w3,u30,Phase III Primary School
 s15,l3,w3,u31,Phase III A/Behind university Of Abuja Open space
 s15,l3,w3,u32,Phase III A/Behind university Of Abuja Open space
@@ -59881,7 +59881,7 @@
 s15,l3,w3,u38,Phase III Jss
 s15,l3,w3,u39,Phase III Jss
-s15,l3,w3,u40,Kotangora Estate Primary school
-s15,l3,w3,u41,Kotangora Estate Primary school
-s15,l3,w3,u42,Kotangora Estate Primary school
+s15,l3,w3,u40,Kotangora Estate Primary School
+s15,l3,w3,u41,Kotangora Estate Primary School
+s15,l3,w3,u42,Kotangora Estate Primary School
 s15,l3,w3,u43,Gss Hajj Camp
 s15,l3,w4,u1,Ibwa sarki/Pri. sch. Ibwa
@@ -59889,20 +59889,20 @@
 s15,l3,w4,u3,Dukwa/Dukwa Pri. sch.
 s15,l3,w4,u4,Gurfata/Gurufata Pri. sch.
-s15,l3,w4,u5,Ika I/II Primary school
-s15,l3,w4,u6,Kwamuku Primary school
-s15,l3,w4,u7,Ibwa sarki Primary school.
-s15,l3,w4,u8,Ibwa sarki Primary school.
-s15,l3,w4,u9,Ibwa sarki Primary school.
-s15,l3,w4,u10,Ibwa Pada Lea Primary school.
-s15,l3,w4,u11,Ibwa Pada Lea Primary school.
-s15,l3,w4,u12,Rafin Zurfi Primary school.
-s15,l3,w4,u13,Rafin Zurfi Primary school.
-s15,l3,w4,u14,Dukwa/Dukwa Primary school.
-s15,l3,w4,u15,Dukwa/Dukwa Primary school.
-s15,l3,w4,u16,Dukwa/Dukwa Primary school.
-s15,l3,w4,u17,Dukwa/Dukwa Primary school.
+s15,l3,w4,u5,Ika I/II Primary School
+s15,l3,w4,u6,Kwamuku Primary School
+s15,l3,w4,u7,Ibwa sarki Primary School.
+s15,l3,w4,u8,Ibwa sarki Primary School.
+s15,l3,w4,u9,Ibwa sarki Primary School.
+s15,l3,w4,u10,Ibwa Pada Lea Primary School.
+s15,l3,w4,u11,Ibwa Pada Lea Primary School.
+s15,l3,w4,u12,Rafin Zurfi Primary School.
+s15,l3,w4,u13,Rafin Zurfi Primary School.
+s15,l3,w4,u14,Dukwa/Dukwa Primary School.
+s15,l3,w4,u15,Dukwa/Dukwa Primary School.
+s15,l3,w4,u16,Dukwa/Dukwa Primary School.
+s15,l3,w4,u17,Dukwa/Dukwa Primary School.
 s15,l3,w4,u18,Military Barracks Dukwa
-s15,l3,w4,u19,Gurfata Lea Primary school
-s15,l3,w4,u20,Gurfata Lea Primary school
+s15,l3,w4,u19,Gurfata Lea Primary School
+s15,l3,w4,u20,Gurfata Lea Primary School
 s15,l3,w4,u21,Military Barracks Dukpa.
 s15,l3,w4,u22,Military Barracks Dukpa.
@@ -59916,25 +59916,25 @@
 s15,l3,w5,u8,Pagada/Pagada Pri. sch.
 s15,l3,w5,u9,Kpadoro/Kofar sarki
-s15,l3,w5,u10,ungwan sarki Dobi/Primary school Dobi
-s15,l3,w5,u11,ungwan sarki Dobi/Primary school Dobi
-s15,l3,w5,u12,ungwan sarki Dobi/Primary school Dobi
-s15,l3,w5,u13,Ladi Primary school.
-s15,l3,w5,u14,ungwan sarki Dobi B&C/Primary school Dobi 2.
-s15,l3,w5,u15,ungwan sarki Dobi B&C/Primary school Dobi 3.
-s15,l3,w5,u16,ungwan sarki Dobi B&C/Primary school Dobi 4.
-s15,l3,w5,u17,ungwan sarki Dobi B&C/Primary school Dobi 5.
-s15,l3,w5,u18,Dagba Dobi Lea Primary school Etsu1 Dagba Dobi.
-s15,l3,w5,u19,Etsu Dagba 2 Lea Primary school Dobi.
-s15,l3,w5,u20,Kaida sabo/Kaida Primary school.
-s15,l3,w5,u21,Dawaki Lea Primary school
-s15,l3,w5,u22,Pebeyi/Pebeyi Primary school. 2
-s15,l3,w5,u23,Pebeyi/Pebeyi Primary school. 3
-s15,l3,w5,u24,Wumi/Wumi Primary school 2
-s15,l3,w5,u25,Tungan sarki Tsauni/Tsauni Primary school. 2
-s15,l3,w5,u26,Dadabiri Lea Primary school
-s15,l3,w5,u27,Dako Lea Primary school.
-s15,l3,w5,u28,Pagada/Pagada Primary school 2.
-s15,l3,w5,u29,Pagada 2 Lea Primary school.
-s15,l3,w5,u30,Ashara Lea Primary school.
+s15,l3,w5,u10,Ungwan Sarki Dobi/Primary School Dobi
+s15,l3,w5,u11,Ungwan Sarki Dobi/Primary School Dobi
+s15,l3,w5,u12,Ungwan Sarki Dobi/Primary School Dobi
+s15,l3,w5,u13,Ladi Primary School.
+s15,l3,w5,u14,Ungwan Sarki Dobi B&C/Primary School Dobi 2.
+s15,l3,w5,u15,Ungwan Sarki Dobi B&C/Primary School Dobi 3.
+s15,l3,w5,u16,Ungwan Sarki Dobi B&C/Primary School Dobi 4.
+s15,l3,w5,u17,Ungwan Sarki Dobi B&C/Primary School Dobi 5.
+s15,l3,w5,u18,Dagba Dobi Lea Primary School Etsu1 Dagba Dobi.
+s15,l3,w5,u19,Etsu Dagba 2 Lea Primary School Dobi.
+s15,l3,w5,u20,Kaida sabo/Kaida Primary School.
+s15,l3,w5,u21,Dawaki Lea Primary School
+s15,l3,w5,u22,Pebeyi/Pebeyi Primary School. 2
+s15,l3,w5,u23,Pebeyi/Pebeyi Primary School. 3
+s15,l3,w5,u24,Wumi/Wumi Primary School 2
+s15,l3,w5,u25,Tungan sarki Tsauni/Tsauni Primary School. 2
+s15,l3,w5,u26,Dadabiri Lea Primary School
+s15,l3,w5,u27,Dako Lea Primary School.
+s15,l3,w5,u28,Pagada/Pagada Primary School 2.
+s15,l3,w5,u29,Pagada 2 Lea Primary School.
+s15,l3,w5,u30,Ashara Lea Primary School.
 s15,l3,w6,u1,Paiko Kore sarki/Paiko Pri. sch.
 s15,l3,w6,u2,Izom Fulani/Bagada Pri. sch.
@@ -59943,24 +59943,24 @@
 s15,l3,w6,u5,Kasanki/Kofar sarki
 s15,l3,w6,u6,Kaida Tsoho/Pry. sch.
-s15,l3,w6,u7,Paiko Kore sarki/Primary school
-s15,l3,w6,u8,Paiko Kore sarki/Primary school
-s15,l3,w6,u9,Paiko Kore sarki/Primary school
-s15,l3,w6,u10,Paiko Kore sarki/Primary school
-s15,l3,w6,u11,Paiko Kore Junior secondary school
-s15,l3,w6,u12,Paiko Kore Junior secondary school
-s15,l3,w6,u13,Paiko Kore Junior secondary school
-s15,l3,w6,u14,Paiko Kore Junior secondary school
+s15,l3,w6,u7,Paiko Kore sarki/Primary School
+s15,l3,w6,u8,Paiko Kore sarki/Primary School
+s15,l3,w6,u9,Paiko Kore sarki/Primary School
+s15,l3,w6,u10,Paiko Kore sarki/Primary School
+s15,l3,w6,u11,Paiko Kore Junior secondary School
+s15,l3,w6,u12,Paiko Kore Junior secondary School
+s15,l3,w6,u13,Paiko Kore Junior secondary School
+s15,l3,w6,u14,Paiko Kore Junior secondary School
 s15,l3,w6,u15,unguwan Doshi Lea
-s15,l3,w6,u16,Izom Fulani/Bagada Primary school
-s15,l3,w6,u17,Passo/Passo Primary school
-s15,l3,w6,u18,Passo/Passo Primary school
-s15,l3,w6,u19,Passo/Passo Primary school
-s15,l3,w6,u20,Passo/Passo Primary school
-s15,l3,w6,u21,Kace Primary school.
-s15,l3,w6,u22,Tsohon Katse Lea Primary school
-s15,l3,w6,u23,Kasanki Lea Primary school
-s15,l3,w6,u24,Kaida Tsohon/Primary school.
-s15,l3,w6,u25,Kaida Tsohon/Primary school.
-s15,l3,w6,u26,Kaida Tsohon/Primary school.
+s15,l3,w6,u16,Izom Fulani/Bagada Primary School
+s15,l3,w6,u17,Passo/Passo Primary School
+s15,l3,w6,u18,Passo/Passo Primary School
+s15,l3,w6,u19,Passo/Passo Primary School
+s15,l3,w6,u20,Passo/Passo Primary School
+s15,l3,w6,u21,Kace Primary School.
+s15,l3,w6,u22,Tsohon Katse Lea Primary School
+s15,l3,w6,u23,Kasanki Lea Primary School
+s15,l3,w6,u24,Kaida Tsohon/Primary School.
+s15,l3,w6,u25,Kaida Tsohon/Primary School.
+s15,l3,w6,u26,Kaida Tsohon/Primary School.
 s15,l3,w7,u1,Tungan Maje/Tungan Maje Pri. sch.
 s15,l3,w7,u2,Yelwan Zuba/Yelwa Zuba Pri. sch.
@@ -59970,53 +59970,53 @@
 s15,l3,w7,u6,Chezeko/Chezeko Pri. sch.
 s15,l3,w7,u7,ung. samu/Health Clinic
-s15,l3,w7,u8,Tungan Maje Lea Primary school.
-s15,l3,w7,u9,Tungan Maje Lea Primary school.
-s15,l3,w7,u10,Tungan Maje Lea Primary school.
+s15,l3,w7,u8,Tungan Maje Lea Primary School.
+s15,l3,w7,u9,Tungan Maje Lea Primary School.
+s15,l3,w7,u10,Tungan Maje Lea Primary School.
 s15,l3,w7,u11,Tungan Maje G s s Tunga Maje.
-s15,l3,w7,u12,Tungan Maje G s s school
-s15,l3,w7,u13,Tungan Maje Adult Education school.
-s15,l3,w7,u14,Tungan Maje Adult Education school.
-s15,l3,w7,u15,Tungan Maje Adult Education school.
-s15,l3,w7,u16,Tungan Maje Adult Education school.
+s15,l3,w7,u12,Tungan Maje G s s School
+s15,l3,w7,u13,Tungan Maje Adult Education School.
+s15,l3,w7,u14,Tungan Maje Adult Education School.
+s15,l3,w7,u15,Tungan Maje Adult Education School.
+s15,l3,w7,u16,Tungan Maje Adult Education School.
 s15,l3,w7,u17,sabon Gari Tungan Maje In Front Of Police station.
 s15,l3,w7,u18,sabon Gari Tungan Maje In Front Of Police station.
-s15,l3,w7,u19,Angwan Kwasu Lea Primary school Angwan Kwasu.
-s15,l3,w7,u20,Yelwan Zuba Lea Primary school.
-s15,l3,w7,u21,Yelwan Zuba Lea Primary school.
-s15,l3,w7,u22,Anagada Lea Primary school Anagada.
-s15,l3,w7,u23,Anagada Lea Primary school Anagada.
+s15,l3,w7,u19,Angwan Kwasu Lea Primary School Angwan Kwasu.
+s15,l3,w7,u20,Yelwan Zuba Lea Primary School.
+s15,l3,w7,u21,Yelwan Zuba Lea Primary School.
+s15,l3,w7,u22,Anagada Lea Primary School Anagada.
+s15,l3,w7,u23,Anagada Lea Primary School Anagada.
 s15,l3,w7,u24,Anagada Primary Health Care Center Anagada.
 s15,l3,w7,u25,Anagada Primary Health Care Center Anagada.
-s15,l3,w7,u26,Anagada Town Lea Primary school Anagada
-s15,l3,w7,u27,shanagu Lea Primary school shanagu.
-s15,l3,w7,u28,Tungan Maje Angwan Dio Lea Primary school.
-s15,l3,w7,u29,Tungan Maje Angwan Dio Lea Primary school.
-s15,l3,w7,u30,Chezeko. Lea Primary school Chezeko.
-s15,l3,w7,u31,ungwan samu Tungan Maje Health Care Clinic.
-s15,l3,w7,u32,ungwan samu Tungan Maje Infront Of Health Care Clinic.
-s15,l3,w7,u33,ungwan samu Health Clinic.
+s15,l3,w7,u26,Anagada Town Lea Primary School Anagada
+s15,l3,w7,u27,shanagu Lea Primary School shanagu.
+s15,l3,w7,u28,Tungan Maje Angwan Dio Lea Primary School.
+s15,l3,w7,u29,Tungan Maje Angwan Dio Lea Primary School.
+s15,l3,w7,u30,Chezeko. Lea Primary School Chezeko.
+s15,l3,w7,u31,Ungwan Samu Tungan Maje Health Care Clinic.
+s15,l3,w7,u32,Ungwan Samu Tungan Maje Infront Of Health Care Clinic.
+s15,l3,w7,u33,Ungwan Samu Health Clinic.
 s15,l3,w8,u1,ung. sarki/Pri sch.
 s15,l3,w8,u2,sabon Gari/Zuba Clinic
 s15,l3,w8,u3,ung. Kasa/Infront Of Madaki House
 s15,l3,w8,u4,sabon Kasuwa/Nurtw Office
-s15,l3,w8,u5,ungwan sarki Primary school Zuba.
-s15,l3,w8,u6,ungwan sarki Primary school Zuba.
-s15,l3,w8,u7,ungwan sarki Primary school Zuba.
-s15,l3,w8,u8,ungwan sarki Primary school Zuba.
-s15,l3,w8,u9,ungwan sarki Primary school Zuba.
-s15,l3,w8,u10,ungwan sarki Primary school Zuba.
-s15,l3,w8,u11,ungwan sarki Primary school Zuba.
-s15,l3,w8,u12,ungwan sarki Primary school Zuba.
-s15,l3,w8,u13,Agora Lea Agora Primary school Zuba.
-s15,l3,w8,u14,Agora Lea Agora Primary school Zuba.
-s15,l3,w8,u15,Agora Lea Agora Primary school Zuba.
-s15,l3,w8,u16,Agora Lea Agora Primary school Zuba.
+s15,l3,w8,u5,Ungwan Sarki Primary School Zuba.
+s15,l3,w8,u6,Ungwan Sarki Primary School Zuba.
+s15,l3,w8,u7,Ungwan Sarki Primary School Zuba.
+s15,l3,w8,u8,Ungwan Sarki Primary School Zuba.
+s15,l3,w8,u9,Ungwan Sarki Primary School Zuba.
+s15,l3,w8,u10,Ungwan Sarki Primary School Zuba.
+s15,l3,w8,u11,Ungwan Sarki Primary School Zuba.
+s15,l3,w8,u12,Ungwan Sarki Primary School Zuba.
+s15,l3,w8,u13,Agora Lea Agora Primary School Zuba.
+s15,l3,w8,u14,Agora Lea Agora Primary School Zuba.
+s15,l3,w8,u15,Agora Lea Agora Primary School Zuba.
+s15,l3,w8,u16,Agora Lea Agora Primary School Zuba.
 s15,l3,w8,u17,ung Kasa Old Court Zuba Open space
 s15,l3,w8,u18,ung Kasa Old Court Zuba Open space
 s15,l3,w8,u19,ung Kasa Old Court Zuba Open space
-s15,l3,w8,u20,ung Kasa Extension Pilot Primary school Zuba
-s15,l3,w8,u21,ung Kasa Extension Pilot Primary school Zuba
-s15,l3,w8,u22,ung Kasa Extension Pilot Primary school Zuba
-s15,l3,w8,u23,ung Kasa Extension Pilot Primary school Zuba
+s15,l3,w8,u20,ung Kasa Extension Pilot Primary School Zuba
+s15,l3,w8,u21,ung Kasa Extension Pilot Primary School Zuba
+s15,l3,w8,u22,ung Kasa Extension Pilot Primary School Zuba
+s15,l3,w8,u23,ung Kasa Extension Pilot Primary School Zuba
 s15,l3,w8,u24,sabon Kasuwa/Nurtw Office Open space
 s15,l3,w8,u25,sabon Kasuwa/Nurtw Office Open space
@@ -60024,25 +60024,25 @@
 s15,l3,w8,u27,sabon Kasuwa/Nurtw Office Open space
 s15,l3,w8,u28,sabon Kasuwa/Nurtw Office Open space
-s15,l3,w8,u29,Zuba south Lea Primary school Zuba south.
-s15,l3,w8,u30,Zuba south Lea Primary school Zuba south.
+s15,l3,w8,u29,Zuba south Lea Primary School Zuba south.
+s15,l3,w8,u30,Zuba south Lea Primary School Zuba south.
 s15,l3,w9,u1,Ikwa/Ikwa Pri. sch.
 s15,l3,w9,u2,Tungan Ladan/Pri. sch.
 s15,l3,w9,u3,shaga/Bassan Zuba/shaga Pri. sch.
 s15,l3,w9,u4,Chitumu/Kofar Gidan sarki
-s15,l3,w9,u5,Ikwa Lea Primary school Ikwa
-s15,l3,w9,u6,Ikwa Lea Primary school Ikwa.
-s15,l3,w9,u7,Ikwa Lea Primary school Ikwa.
-s15,l3,w9,u8,Ikwa Lea Primary school Ikwa.
-s15,l3,w9,u9,Ikwa Lea Primary school Ikwa.
-s15,l3,w9,u10,Ikwa Lea Primary school Ikwa.
-s15,l3,w9,u11,Yimi Lea Primary school Yimi.
-s15,l3,w9,u12,Yimi Lea Primary school Yimi.
-s15,l3,w9,u13,Machada Proposed sites Lea Primary school Machada.
-s15,l3,w9,u14,Tungan Ladan Lea Primary school
-s15,l3,w9,u15,Tungan Ladan Lea Primary school
-s15,l3,w9,u16,shaga/Bassa Zuba Lea Primary school.
-s15,l3,w9,u17,Gaji Lea Primary school
-s15,l3,w9,u18,Chitimu Lea Primary school
-s15,l3,w9,u19,Chitimu Lea Primary school
+s15,l3,w9,u5,Ikwa Lea Primary School Ikwa
+s15,l3,w9,u6,Ikwa Lea Primary School Ikwa.
+s15,l3,w9,u7,Ikwa Lea Primary School Ikwa.
+s15,l3,w9,u8,Ikwa Lea Primary School Ikwa.
+s15,l3,w9,u9,Ikwa Lea Primary School Ikwa.
+s15,l3,w9,u10,Ikwa Lea Primary School Ikwa.
+s15,l3,w9,u11,Yimi Lea Primary School Yimi.
+s15,l3,w9,u12,Yimi Lea Primary School Yimi.
+s15,l3,w9,u13,Machada Proposed sites Lea Primary School Machada.
+s15,l3,w9,u14,Tungan Ladan Lea Primary School
+s15,l3,w9,u15,Tungan Ladan Lea Primary School
+s15,l3,w9,u16,shaga/Bassa Zuba Lea Primary School.
+s15,l3,w9,u17,Gaji Lea Primary School
+s15,l3,w9,u18,Chitimu Lea Primary School
+s15,l3,w9,u19,Chitimu Lea Primary School
 s15,l3,w9,u20,ung sarki Ikwa Primary Heath Care Ikwa.
 s15,l3,w10,u1,Gwako Town/Pri. sch.
@@ -60051,31 +60051,31 @@
 s15,l3,w10,u4,Giri/Giri Pri. sch.
 s15,l3,w10,u5,Kpasele/Kofar Gidan sarki
-s15,l3,w10,u6,Gwako Town/Primary school
-s15,l3,w10,u7,Gwako Town/Primary school
-s15,l3,w10,u8,Gwako Town/Primary school
-s15,l3,w10,u9,Gwako Town/Primary school
+s15,l3,w10,u6,Gwako Town/Primary School
+s15,l3,w10,u7,Gwako Town/Primary School
+s15,l3,w10,u8,Gwako Town/Primary School
+s15,l3,w10,u9,Gwako Town/Primary School
 s15,l3,w10,u10,Gwako Town Jss
 s15,l3,w10,u11,Gwako Town Jss
 s15,l3,w10,u12,Gwako Town Jss
-s15,l3,w10,u13,Tungan Maje G s s school
-s15,l3,w10,u14,Gwako II Lea Primary school
-s15,l3,w10,u15,Gwako II Lea Primary school
-s15,l3,w10,u16,Gwako II Lea Primary school
-s15,l3,w10,u17,Malauni/Kpakuru/Kpakuru Primary school.
+s15,l3,w10,u13,Tungan Maje G s s School
+s15,l3,w10,u14,Gwako II Lea Primary School
+s15,l3,w10,u15,Gwako II Lea Primary School
+s15,l3,w10,u16,Gwako II Lea Primary School
+s15,l3,w10,u17,Malauni/Kpakuru/Kpakuru Primary School.
 s15,l3,w10,u18,Kpakuru Primary Health Centre
 s15,l3,w10,u19,university Qtrs/Tukunya/security Gate
 s15,l3,w10,u20,university Qtrs/Lea Model Pri sch
 s15,l3,w10,u21,shinka Lea Primary Giri
-s15,l3,w10,u22,Giri Primary school
-s15,l3,w10,u23,Giri Primary school
-s15,l3,w10,u24,Giri Primary school
+s15,l3,w10,u22,Giri Primary School
+s15,l3,w10,u23,Giri Primary School
+s15,l3,w10,u24,Giri Primary School
 s15,l3,w10,u25,Giri Gauta Primary Health Centre
 s15,l3,w10,u26,Kpasele Jss Giri
 s15,l3,w10,u27,Kpasele Jss Giri
 s15,l3,w10,u28,Kpasele Jss Giri
-s15,l3,w10,u29,Giri ube Primary school
-s15,l3,w10,u30,Giri Primary school
-s15,l3,w10,u31,Giri Primary school
-s15,l3,w10,u32,Giri Primary school
+s15,l3,w10,u29,Giri ube Primary School
+s15,l3,w10,u30,Giri Primary School
+s15,l3,w10,u31,Giri Primary School
+s15,l3,w10,u32,Giri Primary School
 s15,l4,w1,u1,Kuje Central/Central Pri. Sch
 s15,l4,w1,u2,Kuje Central/Central Pri. Sch.
@@ -60872,5 +60872,5 @@
 s15,l6,w3,u13,Galadima/Galadima Pri. School
 s15,l6,w3,u14,Lugbe F. H. A. Gate
-s15,l6,w3,u15,Community Secondaryschool Kabusa
+s15,l6,w3,u15,Community SecondarySchool Kabusa
 s15,l6,w3,u16,Angwan Bako
 s15,l6,w3,u17,Shiloh Street
@@ -78961,6 +78961,6 @@
 s19,l14,w2,u6,Ang/S.Wutana K/Gmaiunguwa
 s19,l14,w2,u7,Gobirawa K/Gmaiunguwa
-s19,l14,w2,u8,Barwa I L.E.A.Pry Sschool
-s19,l14,w2,u9,Barwa II L.E.A.Pry Sschool
+s19,l14,w2,u8,Barwa I L.E.A.Pry SSchool
+s19,l14,w2,u9,Barwa II L.E.A.Pry SSchool
 s19,l14,w2,u10,Kurminshado K/G Maiunguwa
 s19,l14,w2,u11,Zakada K/Gmaiunguwa
@@ -94097,5 +94097,5 @@
 s21,l4,w9,u14,Yanduna Arewa C
 s21,l4,w9,u15,Gamaji Masassaka
-s21,l4,w10,u1,Maibara I - Primaryschool
+s21,l4,w10,u1,Maibara I - PrimarySchool
 s21,l4,w10,u2,Maibara II - Primary School
 s21,l4,w10,u3,Kawari Mai Cibi - Kofar Maigari
@@ -102781,5 +102781,5 @@
 s22,l17,w2,u1,Primary School Bandakwai (Bandakwai G/Hakimi)
 s22,l17,w2,u2,Primary School Binuwa (Binwa)
-s22,l17,w2,u3,Primaryschool Bukunji (Bukunji)
+s22,l17,w2,u3,PrimarySchool Bukunji (Bukunji)
 s22,l17,w2,u4,Primary School Gebbe (Garkar Sarki Gebbi)
 s22,l17,w2,u5,Primary School Kalkami (Kalkami G/Liman)
@@ -102836,5 +102836,5 @@
 s22,l17,w5,u2,Primary School Rafin Kirya (Rafin Kirya G/Hakimi)
 s22,l17,w5,u3,Dispensary Tafki Tara (Tafki Tara G/Hakimi A)
-s22,l17,w5,u4,Primaryschool Tafki Tara (Tafki Tara B)
+s22,l17,w5,u4,PrimarySchool Tafki Tara (Tafki Tara B)
 s22,l17,w5,u5,Primary School Keri (Keri G/Hakimi)
 s22,l17,w5,u6,Primary School Waiwayi (Waiwayi G/Hakimi)
@@ -102897,5 +102897,5 @@
 s22,l17,w9,u1,Dan Zugu Garba Open Space (Dan Zugu Garba G/Hakimi A)
 s22,l17,w9,u2,Primary School Dan Zugu Jafaru (Dan Zugu JaAfaru/Ghakimi B)
-s22,l17,w9,u3,Primaryschool Takwaren Sanda (Takware G/Sanda A)
+s22,l17,w9,u3,PrimarySchool Takwaren Sanda (Takware G/Sanda A)
 s22,l17,w9,u4,Primary School Takwaren Fada (Takware/Fada A)
 s22,l17,w9,u5,Tungar Yahaya Open Space (T/Yahaya G/Hakimi)
@@ -114598,4 +114598,641 @@
 s25,l3,w11,u181,Ojikutu/Pius Eze Junction Aboru
 s25,l3,w11,u182,Ago 40 Near Olaide Filling Station Aboru
+s25,l4,w1,u1,Amuwo Odofin Boys High School I
+s25,l4,w1,u2,Amuwo Odofin Boys High School II
+s25,l4,w1,u3,In Front Of Block 449
+s25,l4,w1,u4,"Beside Blk. 358, Amuwo Odofin"
+s25,l4,w1,u5,"Opposite Blk. 358, Amuwo Odofin"
+s25,l4,w1,u6,"Blk. 358, Amuwo Odofin I"
+s25,l4,w1,u7,"Blk. 338, Amuwo Odofin II"
+s25,l4,w1,u8,"Btw. Blk. 306/307, Amuwo Odofin I"
+s25,l4,w1,u9,"Btw. Blk. 306/307, Amuwo Odofin II"
+s25,l4,w1,u10,"Blk. A & B, Amuwo Odofin I"
+s25,l4,w1,u11,"Blk. A & B, Amuwo Odofin II"
+s25,l4,w1,u12,"Blk. 191, Amuwo Odofin"
+s25,l4,w1,u13,"Opp. Blk. 191, Amuwo Odofin"
+s25,l4,w1,u14,"Blk. 248, Amuwo Odofin"
+s25,l4,w1,u15,"Blk. 125, Amuwo Odofin"
+s25,l4,w1,u16,"Opp. Blk. 125, Amuwo Odofin"
+s25,l4,w1,u17,"Blk. 144, Amuwo Odofin"
+s25,l4,w1,u18,"Opp. Blk. 144, Amuwo Odofin"
+s25,l4,w1,u19,"Blk. 264, Amuwo Odofin"
+s25,l4,w1,u20,"Opp. Blk. 264, Amuwo Odofin"
+s25,l4,w1,u21,"Beside Blk. 331, Amuwo Odofin"
+s25,l4,w1,u22,Opp. Central Mosque (Beside Central Mosque Amuwo Odofin)
+s25,l4,w1,u23,"Unity Pry. School, Amuwo Odofin I"
+s25,l4,w1,u24,"Unity Pry. School, Amuwo Odofin II"
+s25,l4,w1,u25,"Blk. 25, Amuwo Odofin"
+s25,l4,w1,u26,"Opp. Blk. 25, Amuwo Odofin"
+s25,l4,w1,u27,"Blk. 70, Amuwo Odofin"
+s25,l4,w1,u28,"Opp. Blk. 70, Amuwo Odofin"
+s25,l4,w1,u29,"Blk. 77, Amuwo Odofin"
+s25,l4,w1,u30,"Opp. Blk. 77, Amuwo Odofin"
+s25,l4,w1,u31,"Btw. Blk. 208/209, Amuwo Odofin I"
+s25,l4,w1,u32,"Btw. Blk. 208/209, Amuwo Odofin II"
+s25,l4,w1,u33,"Blk. 407 & 471, Amuwo Odofin I"
+s25,l4,w1,u34,"Blk. 407 & 471, Amuwo Odofin I"
+s25,l4,w1,u35,Open Space Beside Durbar Gate
+s25,l4,w1,u36,Open Space In Front Of Durbar Gate
+s25,l4,w1,u37,"Btw. Blk. 59 & 61, Amuwo Odofin I"
+s25,l4,w1,u38,"Btw. Blk. 59 & 61, Amuwo Odofin II"
+s25,l4,w1,u39,Beside Blk. 69 & 61 I
+s25,l4,w1,u40,Beside Blk. 69 & 61 II
+s25,l4,w1,u41,Btw. Blk. 520 & 521 I
+s25,l4,w1,u42,Btw. Blk. 520 & 521 II
+s25,l4,w1,u43,Community Pry. School I
+s25,l4,w1,u44,Community Pry. School II
+s25,l4,w1,u45,Blk. 41 & 42
+s25,l4,w1,u46,Btw. Blk. 41 & 42
+s25,l4,w1,u47,Btw. Blk. 30 & 31 I
+s25,l4,w1,u48,Btw. Blk. 30 & 31 II
+s25,l4,w1,u49,Btw. Blk. 49 & 61
+s25,l4,w1,u50,Beside Blk. 49 & 61
+s25,l4,w1,u51,Amuwo Odofin Pry. School I
+s25,l4,w1,u52,Amuwo Odofin Pry. School II
+s25,l4,w1,u53,In Front Of Scotfield Sec. School
+s25,l4,w1,u54,Opposite Scotfield Sec. School
+s25,l4,w1,u55,"Open Space In Front Of Police Station Crystal Estate, Amuwo Odofin"
+s25,l4,w1,u56,"Across The Canal, By Ago-Ilaje Village"
+s25,l4,w1,u57,Infront Of Block 118
+s25,l4,w1,u58,Infront Of Block 279
+s25,l4,w1,u59,Between Blk 376 & Blk 377
+s25,l4,w1,u60,Between Block 325 & 327
+s25,l4,w1,u61,Open Space Of Block 100
+s25,l4,w1,u62,Between Block 10 & Block 12
+s25,l4,w1,u63,Between Block 419 & Block 420
+s25,l4,w1,u64,Between Canal View Gate Block 460
+s25,l4,w1,u65,Eko Akete Junction
+s25,l4,w1,u66,Beside Block 39 & Block 40
+s25,l4,w1,u67,Under Bridge Link Rd Left
+s25,l4,w1,u68,Prayer Est. Entrance Link To Alakoso Area
+s25,l4,w1,u69,Unity Est. Entrance
+s25,l4,w1,u70,Under Bridge Link Rd Right
+s25,l4,w1,u71,Infront Of Block 2
+s25,l4,w1,u72,Infront Of Mega Chicken
+s25,l4,w1,u73,Open Space Of Villila Cottage
+s25,l4,w1,u74,Infront Of Blue Berry
+s25,l4,w1,u75,Open Space At A.M.C
+s25,l4,w1,u76,"No 2, Endaviour Cresent"
+s25,l4,w1,u77,Block 179 (Ijoko Agba)
+s25,l4,w1,u78,Araposopo Open Space/ Playing Ground
+s25,l4,w1,u79,Open Space At Adamawa Estate.
+s25,l4,w1,u80,Infront Of Capital Oil
+s25,l4,w1,u81,Junction Of Ican
+s25,l4,w2,u1,Progressive Pry. Sch. 7th Avenue I
+s25,l4,w2,u2,Progressive Pry. Sch. 7th Avenue II
+s25,l4,w2,u3,"H Close, 7th Avenue"
+s25,l4,w2,u4,"Festac Pry. School, 7th Av. D Close I"
+s25,l4,w2,u5,"Festac Pry. School, 7th Av. D Close II"
+s25,l4,w2,u6,"K Close, 7th Avenue"
+s25,l4,w2,u7,7th Avenue Pry. School I
+s25,l4,w2,u8,7th Avenue Pry. School II
+s25,l4,w2,u9,7th Avenue Blk. 2 Btw. T Close
+s25,l4,w2,u10,7th Avenue M Close
+s25,l4,w2,u11,7th Avenue W Close
+s25,l4,w2,u12,7th Avenue Y Close
+s25,l4,w2,u13,In Front Of 7th Av. Last B/Stop
+s25,l4,w2,u14,Technical College Ado Soba
+s25,l4,w2,u15,23rd O Close Right Side
+s25,l4,w2,u16,23rd O Close Left Side
+s25,l4,w2,u17,"Front Of Akindek, 23rd 3rd Avenue"
+s25,l4,w2,u18,"Opp. Akindek, 23rd 3rd Avenue"
+s25,l4,w2,u19,Opp. Akindek23rd 3rd Avenue
+s25,l4,w2,u20,"23rd Rd. G Close, 2nd Avenue"
+s25,l4,w2,u21,"23rd Rd. S Close, 2nd Avenue"
+s25,l4,w2,u22,23rd Rd. 2nd Avenue Pry. School
+s25,l4,w2,u23,"23rd Rd. C Close, 2nd Avenue"
+s25,l4,w2,u24,24 Rd. In Front Of F.H.A. Playing Ground
+s25,l4,w2,u25,24 Rd. Opp. F.H.A. Playing Ground I
+s25,l4,w2,u26,24 Rd. Opp. F.H.A. Playing Ground II
+s25,l4,w2,u27,23rd Road C Close 2nd Avenue
+s25,l4,w2,u28,24 Rd. In Front Ofansaruddeen Islamic Centre
+s25,l4,w2,u29,24 Rd. Opp. Ansaruddeen Islamic Centre
+s25,l4,w2,u30,24 Rd. Festac College
+s25,l4,w2,u31,24 Rd. A Close I
+s25,l4,w2,u32,2nd Avenue Pry. School
+s25,l4,w2,u33,24 Rd. A Close II
+s25,l4,w2,u34,In Fornt Of House 50 2nd Avenue
+s25,l4,w2,u35,402/23rd 2nd Avenue Right Side
+s25,l4,w2,u36,402/23rd 2nd Avenue Left Side
+s25,l4,w2,u37,402/23rd E Close Junction
+s25,l4,w2,u38,5th Av. J Close Left Side Junction
+s25,l4,w2,u39,"23rd T Close, 2nd Avenue"
+s25,l4,w2,u40,23rd M & O Close Right Side
+s25,l4,w2,u41,23rd M & O Close Left Side
+s25,l4,w2,u42,23 Rd. L Close
+s25,l4,w2,u43,23rd P Close
+s25,l4,w2,u44,2nd Avenue 23rd D Close
+s25,l4,w2,u45,"In Front Of Islamic Centre, 2nd Avenue"
+s25,l4,w2,u46,24 Rd. B Close 2nd Avenue
+s25,l4,w2,u47,"R/Side Of Entr. X Close, 5th Avenue"
+s25,l4,w2,u48,"L/Side Of Entr. X Close, 5th Avenue"
+s25,l4,w2,u49,5th Avenue In Front Of Subuola N/Pry. School
+s25,l4,w2,u50,"5th Avenue H Close, Right Side"
+s25,l4,w2,u51,"5th Avenue H Close, Left Side"
+s25,l4,w2,u52,5th Avenue Right Side Entr. Of I Close
+s25,l4,w2,u53,5th Avenue H Close
+s25,l4,w2,u54,"722 Road, Festac"
+s25,l4,w2,u55,"711 Road Junction, Festac"
+s25,l4,w2,u56,"Opposite Of Central Mosque, Abule"
+s25,l4,w2,u57,"Vocational Training Center, Abule"
+s25,l4,w2,u58,"Baale Street Agbeji Junction, Soba"
+s25,l4,w2,u59,"Fakeye Junction, Soba"
+s25,l4,w2,u60,Oteyi Estate
+s25,l4,w2,u61,Teslim Street
+s25,l4,w2,u62,72 Road By 23rd Junction
+s25,l4,w2,u63,24 Road I Close
+s25,l4,w2,u64,"In Front Of G Close, 24 Road"
+s25,l4,w2,u65,"T Close, 5th Avenue"
+s25,l4,w3,u1,4th Avenue H Close F/Town
+s25,l4,w3,u2,"4th Avenue I Close, F/Town"
+s25,l4,w3,u3,5th Avenue In Front Of Blk. 5
+s25,l4,w3,u4,4th Avenue Primary School
+s25,l4,w3,u5,"In Front Of Leisure Time, J Close 512 Rd., 4th Ave."
+s25,l4,w3,u6,512 Road I Close 4th Avenue
+s25,l4,w3,u7,Central Primary School I
+s25,l4,w3,u8,Central Primary School II
+s25,l4,w3,u9,Festac Grammar School
+s25,l4,w3,u10,512 Road Primary School
+s25,l4,w3,u11,401 Road H Close In Front Of Blk. I
+s25,l4,w3,u12,"41 Road In Front Of Blk 5, Left Side"
+s25,l4,w3,u13,"41 Road In Front Of Blk 5, Left Side"
+s25,l4,w3,u14,"41 Road In Front Of Bk 5, Right Side"
+s25,l4,w3,u15,"Central Pry. Sch., 5th Avenue I"
+s25,l4,w3,u16,"Central Pry. Sch., 5th Avenue II"
+s25,l4,w3,u17,"In Front Of Post Office, 22 Road 2nd Av. - Left"
+s25,l4,w3,u18,In Front Of Post Office 22 Road 2nd Av. - Right
+s25,l4,w3,u19,In Front Of Texaco 22 Road Second Av. L/Side I
+s25,l4,w3,u20,In Front Of Texaco 22 Road Second Av. L/Side II
+s25,l4,w3,u21,In Front Of Texaco 22 Rd. 2nd Av. L/Side
+s25,l4,w3,u22,In Front Of Texaco 22 Rd. 2nd Av./L/Side
+s25,l4,w3,u23,In Front Of F.H.A. Club 22nd Rd. 2nd Avenue I
+s25,l4,w3,u24,In Front Of F.H.A. Club 22nd Rd. 2nd Avenue II
+s25,l4,w3,u25,3rd Avenue E Close
+s25,l4,w3,u26,3rd Avenue T Close
+s25,l4,w3,u27,3rd Avenue 321 Rd. A Close
+s25,l4,w3,u28,3rd Avenue 321 Rd. B Close
+s25,l4,w3,u29,3rd Avenue 321 Rd. I Close
+s25,l4,w3,u30,3rd Avenue 321 Rd. J Close
+s25,l4,w3,u31,"In Front Of Nazareth School, 3rd Avenue"
+s25,l4,w3,u32,3rd Avenue Y Close
+s25,l4,w3,u33,322 Road E Close Junction
+s25,l4,w3,u34,322 Road E Close
+s25,l4,w3,u35,In Front Of F.H.A. Club 22 Rd. L/Side I
+s25,l4,w3,u36,In Front Of F.H.A. Club 22 Rd. L/Side II
+s25,l4,w3,u37,F.H.A. Club 22 Road I
+s25,l4,w3,u38,F.H.A. Club 22 Road II
+s25,l4,w3,u39,3rd Avenue L Close
+s25,l4,w3,u40,Opposite Upe School
+s25,l4,w3,u41,"In Front Of Blk. 8, 512 Road"
+s25,l4,w3,u42,512 Road A Close
+s25,l4,w3,u43,512 Road B Close
+s25,l4,w3,u44,512 Road C Close
+s25,l4,w3,u45,512 Road D Close
+s25,l4,w3,u46,5th Avenue A Close I
+s25,l4,w3,u47,5th Avenue A Close II
+s25,l4,w3,u48,5th Avenue D Close
+s25,l4,w3,u49,5th Avenue Q Close
+s25,l4,w3,u50,"5th Avenue, 52 Road Junction Of House 13 - I"
+s25,l4,w3,u51,"5th Avenue 52 Road, Junction Of House 13 - II"
+s25,l4,w3,u52,5th Avenue Primary School
+s25,l4,w3,u53,"4th Avenue, 41 Rd. A Close, Block 1, R/Side I"
+s25,l4,w3,u54,"4th Avenue,. 41 Rd. A Close Blk. I, R/Side II"
+s25,l4,w3,u55,5th Avenue L Close
+s25,l4,w3,u56,Phase 5th Avenue
+s25,l4,w3,u57,"3rd Avenue, 32 Road Junction"
+s25,l4,w3,u58,5th Avenue I Close
+s25,l4,w3,u59,4th Avenue Between 5th Avenue & 41 Road
+s25,l4,w3,u60,"403, Road By B Close Children Playing Ground 4th Avenue"
+s25,l4,w3,u61,5th Avenue In Front Of Block 3
+s25,l4,w3,u62,401 Road G Close
+s25,l4,w3,u63,401 Road I Close
+s25,l4,w3,u64,401 Road F Close
+s25,l4,w3,u65,5th Avenue W Close
+s25,l4,w3,u66,207 Road E Close
+s25,l4,w3,u67,22 Road H Close
+s25,l4,w3,u68,22 Road A Close
+s25,l4,w3,u69,206 Road F Close
+s25,l4,w3,u70,321 Road G Close
+s25,l4,w3,u71,"3rd Avenue, 302 Road"
+s25,l4,w3,u72,207 Road In Front Of Block 6
+s25,l4,w3,u73,3rd Avenue J Close
+s25,l4,w3,u74,"5th Avenue, 511 Road In Front Of Block 5"
+s25,l4,w3,u75,4th Avenue 41 Road K Close
+s25,l4,w3,u76,"5th Avenue J Close,"
+s25,l4,w3,u77,"41 Road, By 4th Avenue Junction"
+s25,l4,w3,u78,"400 Road, In Front Of H Close"
+s25,l4,w3,u79,"423 Junction, Cavera Estate,"
+s25,l4,w3,u80,"6th Avenue, Omoonile Area, Isheri Rd, Festac"
+s25,l4,w4,u1,No. 30 Cardoso Street
+s25,l4,w4,u2,"No. 6, Akere Street"
+s25,l4,w4,u3,No. 5 Akere Street
+s25,l4,w4,u4,No. 16 Johnson Street
+s25,l4,w4,u5,"No. 2, Johnson Street"
+s25,l4,w4,u6,Dr. Lucas Mem. High School I
+s25,l4,w4,u7,Dr. Lucas Mem. High School II
+s25,l4,w4,u8,Dr. Lucas Mem. High School III
+s25,l4,w4,u9,Outside Gate Of Beachland Estate
+s25,l4,w4,u10,Beside Gate Of Beachland Estate
+s25,l4,w4,u11,"L.A. Pry. Sch., Kirikiri I"
+s25,l4,w4,u12,"L.A. Pry. Sch., Kirikiri II"
+s25,l4,w4,u13,"10, Ajanlekoko Street, Kirikiri"
+s25,l4,w4,u14,"29, Ajanlekoko Street, Kirikiri"
+s25,l4,w4,u15,"No. 5, Adeyemo Street"
+s25,l4,w4,u16,No4. Sokunbi Street
+s25,l4,w4,u17,Junction Of Fakuade/Imam Busari
+s25,l4,w4,u18,9/11 Ija Ogbomo St. Magbesa
+s25,l4,w4,u19,"49, Ija Ogbomo St. Magbesa"
+s25,l4,w4,u20,"16, Otun Street"
+s25,l4,w4,u21,"10, Ilaje Street"
+s25,l4,w4,u22,Junction Of Karimu/Alekotile Street
+s25,l4,w4,u23,Cps Pry. School
+s25,l4,w4,u24,Cps Pry. School
+s25,l4,w4,u25,20 Dilliton Street
+s25,l4,w4,u26,"9, Okoduwa Street"
+s25,l4,w4,u27,"20, Okoduwa Street"
+s25,l4,w4,u28,Navy Town Entrance I
+s25,l4,w4,u29,Navy Town Entrance II
+s25,l4,w4,u30,Navy Town Entrance III
+s25,l4,w4,u31,Navy Town Entrance IV
+s25,l4,w4,u32,Navy Town Entrance V
+s25,l4,w4,u33,Navy Town Entrance VI
+s25,l4,w4,u34,Navy Town Entrance VII
+s25,l4,w4,u35,Navy Town Entrance VIII
+s25,l4,w4,u36,Navy Town Entrance IX
+s25,l4,w4,u37,Navy Town Entrance X
+s25,l4,w4,u38,"34, Cardoso Street"
+s25,l4,w4,u39,"9, Akere Street"
+s25,l4,w4,u40,"7, Akere Street"
+s25,l4,w4,u41,Memorial Jnr High School
+s25,l4,w4,u42,In Front Of Nigeria Correction Centre
+s25,l4,w4,u43,Dr Lucas Memorial High School III
+s25,l4,w4,u44,Outside Beachland Estate
+s25,l4,w4,u45,Gate Of Beachland Estate
+s25,l4,w4,u46,10/12 Ija Ogbomo Street Magbesa
+s25,l4,w4,u47,C.P.S Primary School II
+s25,l4,w4,u48,Open Space In C.P.S Primary School
+s25,l4,w4,u49,Open Space In Broadway Dillion
+s25,l4,w4,u50,Junction Of Okoduwa Street
+s25,l4,w4,u51,"12, Okoduwa Street"
+s25,l4,w4,u52,Opp. 25 Okoduwa Street
+s25,l4,w4,u53,Opp. Navy Town Entrance I
+s25,l4,w4,u54,Opp. Navy Town Entrance III
+s25,l4,w4,u55,Navy Town Entrance
+s25,l4,w4,u56,Opposite Right Side Of Navy Town Entrance
+s25,l4,w4,u57,Opposite Left Side Of Navy Town Entrance IX
+s25,l4,w4,u58,Opposide Navy Town Entrance IX
+s25,l4,w4,u59,Beside Of Left Side Of Navy Town Entrance
+s25,l4,w5,u1,138 Old Ojo Road Oluti
+s25,l4,w5,u2,134 Old Ojo Road Oluti
+s25,l4,w5,u3,Amuwo Grammar Sch. Agboju
+s25,l4,w5,u4,Opp. Side Of Cales Supermarket Ojo Road
+s25,l4,w5,u5,In Front Of Cales Supermarket Ojo Road
+s25,l4,w5,u6,Junction Of Jimoh Street Old Ojo Road I
+s25,l4,w5,u7,Junction Of Jimoh Street Old Ojo Road II
+s25,l4,w5,u8,In Front Of Maryola Pry. School
+s25,l4,w5,u9,Opp. Maryola Pry. School
+s25,l4,w5,u10,"122 Old Ojo Road, Amuwo"
+s25,l4,w5,u11,Oyewole Pry. Sch. Maza-Maza I
+s25,l4,w5,u12,Oyewole Pry. Sch. Maza-Maza II
+s25,l4,w5,u13,Junction Of Saibu/Abudu Lane
+s25,l4,w5,u14,"12, Essietedo Street Navy Town Road"
+s25,l4,w5,u15,"Junction Of Essietedo Street, Navy Town"
+s25,l4,w5,u16,Opp. Junction Essietedo Street
+s25,l4,w5,u17,B/W No. 19/20 Casco Street Agboju
+s25,l4,w5,u18,No. 22 Casco Street Agboju
+s25,l4,w5,u19,No. 1 Oremeji Street Agboju
+s25,l4,w5,u20,Opp. 8 Idowu Street
+s25,l4,w5,u21,20 Idowu Street
+s25,l4,w5,u22,Amuwo Community Hall I
+s25,l4,w5,u23,Amuwo Community Hall II
+s25,l4,w5,u24,Opp. Amuwo Community Hall I
+s25,l4,w5,u25,Opp. Amuwo Community Hall II
+s25,l4,w5,u26,Opp. Amuwo Community Hall III
+s25,l4,w5,u27,"Opp. No. 5, Balogun Street"
+s25,l4,w5,u28,"14, Bale Street Amuwo"
+s25,l4,w5,u29,"7, Karimu Street Agboju I"
+s25,l4,w5,u30,"7, Karimu Street Agboju II"
+s25,l4,w5,u31,"7, Amosu Street Agboju III"
+s25,l4,w5,u32,"7, Amosu Street Agboju IV"
+s25,l4,w5,u33,"8, Moradeyo Street"
+s25,l4,w5,u34,"2/5, Moradeyo Street"
+s25,l4,w5,u35,"4, Ishola Street"
+s25,l4,w5,u36,"2/2, Ishola Street"
+s25,l4,w5,u37,"6, Adaranijo Street I"
+s25,l4,w5,u38,"6, Adaranijo Street II"
+s25,l4,w5,u39,"23, Baruwa Street"
+s25,l4,w5,u40,Z.I. Pry. Sch. Old Ojo Road
+s25,l4,w5,u41,Junction Of Otun-Oba Olayemi Street
+s25,l4,w5,u42,"26, Olayemi Street"
+s25,l4,w5,u43,"2, Olayemi Street"
+s25,l4,w5,u44,"8, Ebun Olojede Street"
+s25,l4,w5,u45,"2, Aregbesola Street"
+s25,l4,w5,u46,"Opp. 10, Moshalashi Street I"
+s25,l4,w5,u47,"Opp. 10, Moshalashi Street II"
+s25,l4,w5,u48,"46, Alahun Osunba Street I"
+s25,l4,w5,u49,"46, Alahun Osunba Street II"
+s25,l4,w5,u50,"23, Oyewole Street"
+s25,l4,w5,u51,"26, Olayemi Street"
+s25,l4,w5,u52,"27, Fashinro Street I"
+s25,l4,w5,u53,"27, Fashinro Street II"
+s25,l4,w5,u54,"16, Fashinro Street"
+s25,l4,w5,u55,"8, Iyekantan Street I"
+s25,l4,w5,u56,"8, Iyekantan Street II"
+s25,l4,w5,u57,"3, Ifebajo Street"
+s25,l4,w5,u58,"21, Adeola Street I"
+s25,l4,w5,u59,"21, Adeola Street II"
+s25,l4,w5,u60,"12, Jimoh Street"
+s25,l4,w5,u61,"11, Alhaji Muritala Street"
+s25,l4,w5,u62,"13, Alhaji Balogun Street I"
+s25,l4,w5,u63,"13, Alhaji Balogun Street II"
+s25,l4,w5,u64,Casco/Akinlojo Street
+s25,l4,w5,u65,"12, Adaranijo Street"
+s25,l4,w5,u66,"Behind Agbala Itura Street, Aderonmu"
+s25,l4,w5,u67,"Opp. Behind Agbala Itura Street, Aderonmu"
+s25,l4,w5,u68,Junction Francis/Okogwu
+s25,l4,w5,u69,"55, Moradeyo Street"
+s25,l4,w5,u70,"24, Saibu Street"
+s25,l4,w5,u71,"57, Alahun Osunba Street I"
+s25,l4,w5,u72,"57, Alahun Osunba Street II"
+s25,l4,w5,u73,"57, Alahun Osunba Street III"
+s25,l4,w5,u74,"32, Muritala Street"
+s25,l4,w5,u75,"21, Balogun Street"
+s25,l4,w5,u76,In Front Of No. 28 Jimoh Street
+s25,l4,w5,u77,"In Front Of 135 Old Ojo Road, Oluti"
+s25,l4,w5,u78,"280, Old Ojo Road, Oluti"
+s25,l4,w5,u79,Junction Of 301 Rd Old Ojo Road Oluti
+s25,l4,w5,u80,200 Old Ojo Road Opp. Amuwo Sec. Sch.
+s25,l4,w5,u81,Entrance Of Cales Supermarket Ojo Road
+s25,l4,w5,u82,"337/339 Old Ojo Road, Alakija"
+s25,l4,w5,u83,In Front Of Oyewole Primary School Maza Maza
+s25,l4,w5,u84,"Near Principal Office, Oyewole Primary School,"
+s25,l4,w5,u85,Saibu/Abudu Lane
+s25,l4,w5,u86,"Open Space Within House 5, Essietedo Street"
+s25,l4,w5,u87,Junction Of Paul Shotinoye Street
+s25,l4,w5,u88,Open Space Within House 26
+s25,l4,w5,u89,"Opp No2, Oremeji Street Agboju"
+s25,l4,w5,u90,Open Space Within Moshalashi Bus Stop Old Ojo Road
+s25,l4,w5,u91,Open Space At Moshalashi Bus Stop Old Ojo Road I
+s25,l4,w5,u92,"8, Balogun Street"
+s25,l4,w5,u93,"19, Bale Street Agboju"
+s25,l4,w5,u94,"46, Baruwa Street Agboju"
+s25,l4,w5,u95,Open Space Opp First Bank
+s25,l4,w5,u96,Open Space Beside 26 Olayemi Street
+s25,l4,w5,u97,Beside 2 Olayemi Street
+s25,l4,w5,u98,Beside Coscharis Group Maza Maza
+s25,l4,w5,u99,Entrance Of Ebun Olojede Street
+s25,l4,w5,u100,Open Space In Front Of Jaden Nur & Py School
+s25,l4,w5,u101,At The Gate Of Iyekantan Moradeyo Str.
+s25,l4,w5,u102,Opp 3 Ifebanjo Abayomi Hotel
+s25,l4,w5,u103,"11, Adeola Street, Oluti"
+s25,l4,w5,u104,"21, Jimoh Street"
+s25,l4,w5,u105,Ogu Junction Casco Street Agboju
+s25,l4,w5,u106,Open Space Beside Trinity Anglican Church
+s25,l4,w5,u107,F-Show Alahun Osunba Street
+s25,l4,w5,u108,Junction Of Bensta A Crescent Monkey Village
+s25,l4,w5,u109,Junction Of Bensta B Crescent Monkey Village
+s25,l4,w6,u1,"Baale Market Square (In Front Of Bale's Palace Road, Ijegun Egba)"
+s25,l4,w6,u2,"Liadi/Baale Palace (Oposite Side Of The Palace, Ijegun Egba)"
+s25,l4,w6,u3,"14, Muse Anidu Street, Ijegun I"
+s25,l4,w6,u4,"14, Muse Anidu Street, Ijegun II"
+s25,l4,w6,u5,No. 7 Ade-Oshodi Street
+s25,l4,w6,u6,Ade-Oshodi Street
+s25,l4,w6,u7,"26, Ade-Oshodi Street"
+s25,l4,w6,u8,"16, Alebiosu Street Ijegun I"
+s25,l4,w6,u9,"16, Alebiosu Street Ijegun II"
+s25,l4,w6,u10,"30, Alebiosu Street, Ijegun"
+s25,l4,w6,u11,Junction Of Olasannoye Street
+s25,l4,w6,u12,Junction Of Olasannoye Street II
+s25,l4,w6,u13,Opp. Junction Of Olasannoye Street
+s25,l4,w6,u14,"24, Olasannoye Street"
+s25,l4,w6,u15,Junction Of Akintomide St./Ogunbode Street
+s25,l4,w6,u16,"14, Akintomide Street"
+s25,l4,w6,u17,Junction Of Edunmoyin/Ibasa Road Maiyegun I
+s25,l4,w6,u18,Junction Of Edunmoyin/Ibasa Road Maiyegun II
+s25,l4,w6,u19,Opp. Junction Of Edunmoyin/Ibasa Road Maiyegun I
+s25,l4,w6,u20,Opp. Junction Of Edunmoyin/Ibasa Road Maiyegun II
+s25,l4,w6,u21,"No. 10, Odo-Eran Street"
+s25,l4,w6,u22,Junction Of Essie/Mokelegbe (Left Side)
+s25,l4,w6,u23,Opp. Junction Of Essie/Mokelegbe (Left Side)
+s25,l4,w6,u24,"20, Odunewu Street"
+s25,l4,w6,u25,"Opp. 20, Odunewu Street"
+s25,l4,w6,u26,20 Maiyegun Street
+s25,l4,w6,u27,Open Space At 1 Oladele Street Ijegun/Marwa Rd
+s25,l4,w6,u28,Open Space At 17 Oladel Street Ijegun
+s25,l4,w6,u29,"Opp 1, Odeyemi/Alebiosu Street Ijegun Mkt"
+s25,l4,w6,u30,Junction Of Odeyemi/Alebiosu Road
+s25,l4,w6,u31,Ogunbode/Rev. Kanu Street Ijegun
+s25,l4,w6,u32,Folarin Junction
+s25,l4,w6,u33,78 Lumac Street
+s25,l4,w6,u34,Pipeline Junction
+s25,l4,w6,u35,Omo-Onke By Alh. Lawal Gate
+s25,l4,w6,u36,Junction Of Olasanloye/Alebiosu
+s25,l4,w6,u37,"31, Akintomide Street Ijegun"
+s25,l4,w6,u38,Opp 1 Mumuni Adio Badmus Rd Ijegun Egba
+s25,l4,w6,u39,1 Unity/Edunmoyin Street Ijegun
+s25,l4,w6,u40,Irabor/Cele Church Road Ijegun
+s25,l4,w6,u41,"67, Alebiosu Str By Lucky Ogule Junction"
+s25,l4,w6,u42,Lawanson Junction Ijegun
+s25,l4,w6,u43,14 Rasaki Oladega Street Ijegun
+s25,l4,w6,u44,"6, Rasaki Odunewu Street"
+s25,l4,w7,u1,Junction Of Bale Abule Oshun
+s25,l4,w7,u2,"Junction Of Saka, Cele Church I"
+s25,l4,w7,u3,"Junction Of Saka, Cele Church II"
+s25,l4,w7,u4,Sadia Onanuga/Irede Road
+s25,l4,w7,u5,Junction Of Sadia Onanuga/Irede Road
+s25,l4,w7,u6,"No. 4, Momodu Street I"
+s25,l4,w7,u7,"No. 4, Momodu Street II"
+s25,l4,w7,u8,"24, Nurudeen Street"
+s25,l4,w7,u9,"Beside 24, Nurudeen Street"
+s25,l4,w7,u10,"In Front Of 24, Nurudeen Street"
+s25,l4,w7,u11,At The Entrace Of Nurudeen St. Goreje
+s25,l4,w7,u12,End Of Nurudeen Street
+s25,l4,w7,u13,Junction Of Olanrewaju Str. - Right Side
+s25,l4,w7,u14,Left Side Of Olanrewaju Street
+s25,l4,w7,u15,End Of Olanrewaju Street
+s25,l4,w7,u16,"4, Bale Street I"
+s25,l4,w7,u17,"4, Bale Street II"
+s25,l4,w7,u18,"12, Owode Street I"
+s25,l4,w7,u19,"12, Owode Street II"
+s25,l4,w7,u20,"12, Owode Street III"
+s25,l4,w7,u21,Junction Of Close 37 Left Side I
+s25,l4,w7,u22,Junction Of Close 37 Left Side II
+s25,l4,w7,u23,Junction Of Close 37 Left Side III
+s25,l4,w7,u24,B/W Mobil/Agip Est. Left Side
+s25,l4,w7,u25,Opp. Side Of No. 18 Abiloye St. Near Ang. Church
+s25,l4,w7,u26,Junction Of Onatamere Street
+s25,l4,w7,u27,Opp. Junction Of Onatamere Street
+s25,l4,w7,u28,"2, Omila Road"
+s25,l4,w7,u29,"Beside 10, Mission St./Omila St."
+s25,l4,w7,u30,Open Space At Close 54
+s25,l4,w7,u31,Open Space In Front Of Chevron H. Estate
+s25,l4,w7,u32,In Front Of Nitel Qtrs.
+s25,l4,w7,u33,Behind Union Bank Estate
+s25,l4,w7,u34,Opp. Side Of Close 7
+s25,l4,w7,u35,Junction Of Close 14
+s25,l4,w7,u36,"Close 26, Junction Left Side"
+s25,l4,w7,u37,Junction Of Close 37 Right/Side
+s25,l4,w7,u38,Ijegun Egba Primary School I
+s25,l4,w7,u39,Ijegun Egba Primary School II
+s25,l4,w7,u40,B/W Flour Mill/Doyin Estate I
+s25,l4,w7,u41,B/W Flour Mill/Doyin Estate II
+s25,l4,w7,u42,"In Front Of Gulf Housing Estate, Nnpc"
+s25,l4,w7,u43,B/W Union Bank Estate
+s25,l4,w7,u44,In Front Of Gulf Housing Estate
+s25,l4,w7,u45,B/W Eagle H. Estate
+s25,l4,w7,u46,Within Cbn Estate I
+s25,l4,w7,u47,Within Ebute Ango
+s25,l4,w7,u48,Open Space At The End Of Bale Street Abule Oshun
+s25,l4,w7,u49,Junction Of Lawal Street Ashogun
+s25,l4,w7,u50,Opposite Black Horse Road Old Ojo Rd
+s25,l4,w7,u51,Junction Of Shem Joshua Street Irede
+s25,l4,w7,u52,Junction Of Idemili Street Irede Road
+s25,l4,w7,u53,"Junction Of Unique Estate, Dansal Road,"
+s25,l4,w7,u54,Junction Of Moshalashi/Badekale Street
+s25,l4,w7,u55,"12, Olanipekun Street Owode"
+s25,l4,w7,u56,Centre Of Ganiyu Jimoh Street Owode
+s25,l4,w7,u57,Behind Ogo Oluwa Shopping Complex Bale Street
+s25,l4,w7,u58,Entrance Of Onireke Bale Street
+s25,l4,w7,u59,Junction Of Abule Ado/Adamson Street
+s25,l4,w7,u60,Junction Of Adeloye/Abule Ado Street Owode
+s25,l4,w7,u61,Junction Of Kano Street
+s25,l4,w7,u62,Junction Of Luke Emmanuel Street
+s25,l4,w7,u63,Open Space Of Oguntedo Junction
+s25,l4,w7,u64,Junction Of Rasgidi Yusuf/Akpo Street
+s25,l4,w7,u65,Junction Of Saka Adisa/Ashiawu Str
+s25,l4,w7,u66,Junction Of Afam Ezeanya/Uga Street
+s25,l4,w7,u67,Open Space At Close 41
+s25,l4,w7,u68,Junction Of Owolabi Street Dankem School
+s25,l4,w7,u69,Junction Of Sherifatu Street Satellite
+s25,l4,w7,u70,Junction Of Nitel Road
+s25,l4,w7,u71,Junction Of Iya Biye Street Satellite
+s25,l4,w7,u72,Junction Of Assemble Road By Close 14
+s25,l4,w7,u73,Side G Opposite Learning Field Sch.
+s25,l4,w7,u74,Town Planning Road Side C Junction
+s25,l4,w7,u75,In Front Of National Bank Estate
+s25,l4,w7,u76,Stepping Stone Junction
+s25,l4,w7,u77,Junction Of Close 66
+s25,l4,w7,u78,In Front Of First Bank Estate
+s25,l4,w7,u79,Open Space In Front Of Cbn Estate
+s25,l4,w7,u80,Junction Of Sand Field Estate
+s25,l4,w8,u1,"L.A. Primary School, Iyagbe I"
+s25,l4,w8,u2,"L.A. Primary School, Iyagbe II"
+s25,l4,w8,u3,"L.A. Primary School, Iyagbe III"
+s25,l4,w8,u4,"L.A. Primary School, Iyagbe IV"
+s25,l4,w8,u5,Within Ishahayi Sea Beach
+s25,l4,w8,u6,S.A. Primary School I
+s25,l4,w8,u7,S.A. Primary School II
+s25,l4,w8,u8,"Open Space In Front Of Baale's Palace, Irede Village"
+s25,l4,w8,u9,"Open Space Within, Irede Village"
+s25,l4,w8,u10,Within Ishahayi Sea Beach
+s25,l4,w8,u11,Opp. Of Central Mosque Ikaare
+s25,l4,w8,u12,Ita Iga Ikaare
+s25,l4,w8,u13,Irede Town Hall I
+s25,l4,w8,u14,Irede Town Hall II
+s25,l4,w9,u1,"Ivory Grammar School, Ibeshe I"
+s25,l4,w9,u2,"Ivory Grammar School, Ibeshe II"
+s25,l4,w9,u3,"Customary Court, Ibeshe I"
+s25,l4,w9,u4,"Customary Court, Ibeshe II"
+s25,l4,w9,u5,"L.A. Primary School, Ibeshe I"
+s25,l4,w9,u6,"L.A. Primary School, Ibeshe II"
+s25,l4,w9,u7,"L.A. Primary School, Ibasa"
+s25,l4,w9,u8,Within Imore Village I
+s25,l4,w9,u9,Within Ilashe Village II
+s25,l4,w9,u10,"Along Palace, Ibeshe I"
+s25,l4,w9,u11,"Along Palace, Ibeshe II"
+s25,l4,w9,u12,"Opposite Side Of The Palace, Ibeshe"
+s25,l4,w9,u13,"Opposite Oba's Palace Ibore, Ibasa"
+s25,l4,w9,u14,"L.A. Primary School, Ilashe"
+s25,l4,w9,u15,"L.A. Primary School, Ilashe"
+s25,l4,w9,u16,Lasa Primary School Ibeshe I
+s25,l4,w9,u17,Lasa Primary School Ibeshe II
+s25,l4,w9,u18,L.A. Primary School Ibasa I
+s25,l4,w9,u19,L.A. Primary School Ibasa II
+s25,l4,w9,u20,Open Space Opposite Imore Jetty
+s25,l4,w9,u21,Opposite Oba's Palace Ibasa
+s25,l4,w10,u1,"C.S. Primary School, Igbo-Alejo"
+s25,l4,w10,u2,Itun Agan I
+s25,l4,w10,u3,Itun Agan II
+s25,l4,w10,u4,Along Palace Road
+s25,l4,w10,u5,Open Space At Chiku Village
+s25,l4,w10,u6,Igbologun Town Hall I
+s25,l4,w10,u7,Igbologun Town Hall II
+s25,l4,w10,u8,Opposite Igbologun Town Hall I
+s25,l4,w10,u9,Opposite Igbologun Town Hall II
+s25,l4,w10,u10,L.A. Primary School
+s25,l4,w10,u11,Open Space At Okun Glass
+s25,l4,w10,u12,Booth At Ilado Village
+s25,l4,w10,u13,Within Ifako Village
+s25,l4,w10,u14,Booth At Okuata Village
+s25,l4,w10,u15,Within Agala Ajebo Village I
+s25,l4,w10,u16,Within Agala Ajebo Village II
+s25,l4,w10,u17,Within Nante Village
+s25,l4,w10,u18,Open Space Within Ilutuntun Community
+s25,l4,w10,u19,Open Space Within Old Agbojetho Community
+s25,l4,w10,u20,Open Space Within Okoagbe Along Tomaro Road
+s25,l4,w10,u21,Open Space At Bakery Bus Stop
+s25,l4,w10,u22,Igbologun Town Hall
+s25,l4,w10,u23,Open Space At Okemedu Street
+s25,l4,w10,u24,Open Space At Small London
+s25,l4,w10,u25,Ilado Town Hall
+s25,l4,w10,u26,L.A. Primary School Sagbo Kodji
+s25,l4,w10,u27,Bishop Kodji Baale Open Space (Nur & Pry. Sch.)
+s25,l4,w10,u28,Igbo Extension Bolarinwa Street
+s25,l4,w11,u1,1st Avenue F. Close I
+s25,l4,w11,u2,1st Avenue O. Close II
+s25,l4,w11,u3,1st Avenue O. Close III
+s25,l4,w11,u4,"Blk. 2 D Close 111 Road, 1st Avenue"
+s25,l4,w11,u5,1st Avenue I Close
+s25,l4,w11,u6,In Front Of Lora Nurs. & Pry. School
+s25,l4,w11,u7,H. Close III Road 1st Avenue
+s25,l4,w11,u8,201 Road A. Close 2nd Avenue
+s25,l4,w11,u9,21 Road I Close 2nd Avenue I
+s25,l4,w11,u10,21 Road I Close 2nd Avenue II
+s25,l4,w11,u11,III Road 1st Avenue I
+s25,l4,w11,u12,III Road 1st Avenue II
+s25,l4,w11,u13,C. Close 21 Road R/Side I
+s25,l4,w11,u14,C. Close 21 Road R/Side II
+s25,l4,w11,u15,2nd Avenue 21 Road L. Close I
+s25,l4,w11,u16,2nd Avenue 21 Road L. Close II
+s25,l4,w11,u17,U.P.E. Primary School I
+s25,l4,w11,u18,U.P.E. Primary School II
+s25,l4,w11,u19,3rd Avenue Primary School I
+s25,l4,w11,u20,3rd Avenue Primary School II
+s25,l4,w11,u21,Opp. Nazareth N & P School
+s25,l4,w11,u22,Festac Girls Sec. School
+s25,l4,w11,u23,Ideal Primary School 3rd Avenue
+s25,l4,w11,u24,3rd Avenue A. Close
+s25,l4,w11,u25,G. Close 3rd Avenue
+s25,l4,w11,u26,"Front Of Early Life School, 3rd Avenue"
+s25,l4,w11,u27,3rd Avenue A. Close
+s25,l4,w11,u28,3rd Avenue R. Close Junction
+s25,l4,w11,u29,Opp. Loral Nurs. & Pry. Sch. 201 Road
+s25,l4,w11,u30,Opp. Side 111 Rd. 1st Avenue
+s25,l4,w11,u31,201 Road C. Close 21 Road
+s25,l4,w11,u32,C. Close 21 Road R/Side
+s25,l4,w11,u33,E Close 21 Rd. 2nd Avenue I
+s25,l4,w11,u34,E Close 21 Rd. 2nd Avenue II
+s25,l4,w11,u35,21 Road M. Close
+s25,l4,w11,u36,End Of 21 Road
+s25,l4,w11,u37,Beta Nurs. & Pry. Sch. Cross Canal
+s25,l4,w11,u38,111 Road 1st Avenue Back Of Ang. Church
+s25,l4,w11,u39,"1st Avenue, H Close"
+s25,l4,w11,u40,1st Avenue K Close
+s25,l4,w11,u41,1st Avenue O Close
+s25,l4,w11,u42,End Of 201 Road Left Side Of Noral School
+s25,l4,w11,u43,2nd Avenue 201 Road Right Side E Close
+s25,l4,w11,u44,21 Rd K Close 2nd Avenue
+s25,l4,w11,u45,F Close 21 Road
+s25,l4,w11,u46,Open Space At 3rd Avenue Primary School
+s25,l4,w11,u47,Festac Girls Secondary School Right Side
+s25,l4,w11,u48,3rd Avenue C Close
+s25,l4,w11,u49,D Close 3rd Avenue
+s25,l4,w11,u50,Open Space At Loral Nur & Pry School
+s25,l4,w11,u51,2nd Avenue 21 Road E Close Right Side
+s25,l4,w11,u52,"2nd Avenue 21 Rd,"
+s25,l4,w11,u53,21 Road I Close Before Roundabout
+s25,l4,w11,u54,21 Road W Close
+s25,l4,w11,u55,"1st Avenue, Z Close, Across Canal"
+s25,l4,w11,u56,112 Road B Close
 s25,l5,w1,u1,Marine Road I
 s25,l5,w1,u2,Marine Road II
@@ -127531,5 +128168,5 @@
 s26,l11,w4,u2,Nakere - Pri.School
 s26,l11,w4,u3,Nakere - Open Square Nakere
-s26,l11,w4,u4,"Ragga - Pri.Sschool, Ragga"
+s26,l11,w4,u4,"Ragga - Pri.SSchool, Ragga"
 s26,l11,w4,u5,Ragga
 s26,l11,w4,u6,Gbata
@@ -128165,5 +128802,5 @@
 s26,l13,w10,u14,Kofar Tella/Open Space
 s26,l13,w10,u15,Imon/Pri.School
-s26,l13,w10,u16,Kertyo/Pri.Sschool
+s26,l13,w10,u16,Kertyo/Pri.SSchool
 s26,l13,w10,u17,Tsamiya Primary School
 s26,l13,w10,u18,Gidan Mazaki P/S
@@ -149173,5 +149810,5 @@
 s31,l22,w2,u8,Olopemarun Primary School II
 s31,l22,w2,u9,Olopemarun Primary School III
-s31,l22,w2,u10,Olopemarun Primaryschool IV
+s31,l22,w2,u10,Olopemarun PrimarySchool IV
 s31,l22,w2,u11,Kajola Area I
 s31,l22,w2,u12,Kajola Area II
@@ -161497,5 +162134,5 @@
 s33,l21,w3,u15,Afam Ukwu Town Hall
 s33,l21,w3,u16,Open Space Ngwuro Square
-s33,l21,w4,u1,"C.P.Sschool, Akawor"
+s33,l21,w4,u1,"C.P.SSchool, Akawor"
 s33,l21,w4,u2,Open Space Ekeugbo
 s33,l21,w4,u3,Open Space Onwanne Square
Index: main/kofacustom.lpng/trunk/src/kofacustom/lpng/applicants/viewlets.py
===================================================================
--- main/kofacustom.lpng/trunk/src/kofacustom/lpng/applicants/viewlets.py	(revision 17250)
+++ main/kofacustom.lpng/trunk/src/kofacustom/lpng/applicants/viewlets.py	(revision 17254)
@@ -76,4 +76,6 @@
         if self.context.p_state != 'unpaid':
             return ''
+        if self.context.p_currency != 'NGN':
+            return ''
         if self.context.amount_auth == 0:
             return ''
Index: main/kofacustom.lpng/trunk/src/kofacustom/lpng/interfaces.py
===================================================================
--- main/kofacustom.lpng/trunk/src/kofacustom/lpng/interfaces.py	(revision 17250)
+++ main/kofacustom.lpng/trunk/src/kofacustom/lpng/interfaces.py	(revision 17254)
@@ -76,4 +76,9 @@
         )
 
+    paypal_enabled = schema.Bool(
+        title = _(u'Paypal integration enabled'),
+        default = False,
+        )
+
 
     # Additional fees in custom package add here
Index: main/kofacustom.lpng/trunk/src/kofacustom/lpng/interswitch/tests.py
===================================================================
--- main/kofacustom.lpng/trunk/src/kofacustom/lpng/interswitch/tests.py	(revision 17250)
+++ main/kofacustom.lpng/trunk/src/kofacustom/lpng/interswitch/tests.py	(revision 17254)
@@ -54,4 +54,5 @@
         configuration = SessionConfiguration()
         configuration.academic_session = datetime.now().year - 2
+        configuration.interswitch_webcheckout_enabled = True
         self.app['configuration'].addSessionConfiguration(configuration)
         self.configuration = configuration
@@ -75,5 +76,6 @@
         self.browser.getControl(name="form.balance_amount").value = '500'
         self.browser.getControl(name="form.p_category").value = ['donation']
-        self.browser.getControl("Initiate").click()
+        self.browser.getControl(name="form.p_option").value = ['NGN']
+        self.browser.getControl("Create ticket").click()
 
         self.assertMatches('...ticket created...',
Index: main/kofacustom.lpng/trunk/src/kofacustom/lpng/students/tests/test_export.py
===================================================================
--- main/kofacustom.lpng/trunk/src/kofacustom/lpng/students/tests/test_export.py	(revision 17250)
+++ main/kofacustom.lpng/trunk/src/kofacustom/lpng/students/tests/test_export.py	(revision 17254)
@@ -104,12 +104,12 @@
         self.assertMatches(
             'ac,amount_auth,creation_date,gateway_amt,net_amt,'
-            'p_category,p_combi,p_current,'
+            'p_category,p_combi,p_currency,p_current,'
             'p_id,p_item,p_level,p_option,p_session,p_state,payment_date,provider_amt,'
             'r_amount_approved,r_card_num,r_code,r_company,r_desc,'
-            'r_pay_reference,thirdparty_amt,student_id,state,'
+            'r_pay_reference,r_payment_link,thirdparty_amt,student_id,state,'
             'current_session\r\n'
-            '666,12.12,%s-04-01 13:12:01#,,,schoolfee,[],1,my-id,p-item,'
+            '666,12.12,%s-04-01 13:12:01#,,,schoolfee,[],,1,my-id,p-item,'
             '100,,%s,paid,%s-04-01 14:12:01#,,12.12,'
-            '789,r-code,interswatch,,,,A111111,created,2012\r\n'
+            '789,r-code,interswatch,,,,,A111111,created,2012\r\n'
             % (curr_year-6, curr_year-6, curr_year-6), result
             )
Index: main/kofacustom.lpng/trunk/src/kofacustom/lpng/utils/utils.py
===================================================================
--- main/kofacustom.lpng/trunk/src/kofacustom/lpng/utils/utils.py	(revision 17250)
+++ main/kofacustom.lpng/trunk/src/kofacustom/lpng/utils/utils.py	(revision 17254)
@@ -31,4 +31,9 @@
         }
 
+    PAYMENT_OPTIONS = {
+        'NGN': 'Amount in Naira (Payment via Interswitch or USSD)',
+        'USD': 'Amount in Dollar (Payment via Paypal)',
+        }
+
     DISABLE_PAYMENT_GROUP_DICT = {
         }
Index: main/kofacustom.lpng/trunk/versions.cfg
===================================================================
--- main/kofacustom.lpng/trunk/versions.cfg	(revision 17250)
+++ main/kofacustom.lpng/trunk/versions.cfg	(revision 17254)
@@ -5,2 +5,8 @@
 
 [versions]
+# Added by buildout at 2022-12-28 11:22:56.852249
+certifi = 2021.10.8
+chardet = 4.0.0
+idna = 2.10
+requests = 2.27.1
+urllib3 = 1.26.13
