Index: /WAeUP_SRP/fceokene/waeup_custom/getSchoolFee.py
===================================================================
--- /WAeUP_SRP/fceokene/waeup_custom/getSchoolFee.py	(revision 3600)
+++ /WAeUP_SRP/fceokene/waeup_custom/getSchoolFee.py	(revision 3601)
@@ -19,32 +19,70 @@
 
 d = {}
-if str(brain.level) == '100' and brain.review_state == 'cleared_and_validated':
-    if brain.department in ARTS:
-        d['all'] = 11520
+
+if not brain.mode.endswith('_sw'):
+    if str(brain.level) == '000' and brain.review_state == 'cleared_and_validated':
+        if brain.department in ARTS:
+            d['all'] = 15900
+        else:
+            d['all'] = 16400
+    elif str(brain.level) == '100' and brain.review_state == 'cleared_and_validated':
+        if brain.department in ARTS:
+            d['all'] = 13020
+        else:
+            d['all'] = 13495
+    elif str(brain.level) == '100' and brain.review_state == 'returning':
+        if brain.department in ARTS:
+            d['all'] = 12070
+        else:
+            d['all'] = 12545
+    elif str(brain.level) in ('200','210','220'):
+        if brain.department in ARTS:
+            d['all'] = 12070
+        else:
+            d['all'] = 12545
+    # repeaters = spillover
+    elif str(brain.level) in ('300','310','320'):
+        if brain.department in ARTS:
+            d['all'] = 10170
+        else:
+            d['all'] = 10645
     else:
-        d['all'] = 11995
-elif str(brain.level) == '000' and brain.review_state == 'cleared_and_validated':
-    if brain.department in ARTS:
-        d['all'] = 14400
+        d['all'] = 0
+else:
+    if str(brain.level) == '100' and brain.review_state == 'cleared_and_validated':
+        if brain.department in ARTS:
+            d['all'] = 21900
+        else:
+            d['all'] = 22400
+    elif str(brain.level) == '100' and brain.review_state == 'returning':
+        if brain.department in ARTS:
+            d['all'] = 18400
+        else:
+            d['all'] = 18900
+    elif str(brain.level) in ('200','210','220'):
+        if brain.department in ARTS:
+            d['all'] = 20400
+        else:
+            d['all'] = 20900
+    elif str(brain.level) in ('300','310','320'):
+        if brain.department in ARTS:
+            d['all'] = 18400
+        else:
+            d['all'] = 18900
+
+    elif str(brain.level) in ('400','410','420'):
+        if brain.department in ARTS:
+            d['all'] = 18400
+        else:
+            d['all'] = 18900
+
+    # repeaters = spillover
+    elif str(brain.level) in ('500','510','520'):
+        if brain.department in ARTS:
+            d['all'] = 16900
+        else:
+            d['all'] = 17400
     else:
-        d['all'] = 14900
-elif str(brain.level) == '100' and brain.review_state == 'returning':
-    if brain.department in ARTS:
-        d['all'] = 10570
-    else:
-        d['all'] = 11045
-elif str(brain.level) in ('200','210','220'):
-    if brain.department in ARTS:
-        d['all'] = 10570
-    else:
-        d['all'] = 11045
-# repeaters = spillover
-elif str(brain.level) in ('300','310','320'):
-    if brain.department in ARTS:
-        d['all'] = 8670
-    else:
-        d['all'] = 9145
-else:
-    d['all'] = 0
+        d['all'] = 0
 
 
