diff --git a/AstuteSystem/src/main/java/com/astute/dao/DAO.java b/AstuteSystem/src/main/java/com/astute/dao/DAO.java
index 9edaf72..4eeb050 100644
--- a/AstuteSystem/src/main/java/com/astute/dao/DAO.java
+++ b/AstuteSystem/src/main/java/com/astute/dao/DAO.java
@@ -1,13 +1,17 @@
 package com.astute.dao;
 
-import com.astute.exceptions.AstuteException;
 import com.astute.exceptions.AstuteException;
 import com.astute.model.*;
 
-import java.io.*;
-import java.sql.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.sql.Connection;
 import java.sql.Date;
-import java.util.*;
+import java.sql.ResultSet;
+import java.util.List;
+import java.util.Properties;
 
 public abstract class DAO {
     public static DAO dao;
@@ -94,11 +98,11 @@ public abstract class DAO {
 
     public abstract void updatePOMaster(String PONum, String contractNum, java.sql.Date PODate, Double contractAmt) throws AstuteException;
 
-    public abstract void updatePODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, int serviceTypeId, String schedule, java.sql.Date deiverBy) throws AstuteException;
+    public abstract void updatePODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, int serviceTypeId) throws AstuteException;
 
     public abstract void createPOMaster(String PONum, String contractNum, java.sql.Date PODate, Double contractAmt, int customerId) throws AstuteException;
 
-    public abstract void createPODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, int serviceTypeId, String schedule, java.sql.Date deiverBy) throws AstuteException;
+    public abstract void createPODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, int serviceTypeId) throws AstuteException;
 
 
     public abstract List<Invoice> getInvoiceMaster(String invoiceNumber, int pmtStatus) throws AstuteException;
@@ -144,5 +148,10 @@ public abstract class DAO {
 
     public abstract int createChangeOrder(String poNum, int changeOrderNum, double changeOrderAmt, Date changeOrderDate, String description) throws AstuteException;
 
+    public abstract List<InvoicePayment> getInvoicePayments(String invoiceNum) throws AstuteException;
+
+    public abstract void updateInvoicePayment(String invoiceNum, int invoicePaymentId, Double paymentAmount, Date paymentDate) throws AstuteException;
+
+    public abstract void createInvoicePayment(String invoiceNum, int invoicePaymentTypeId, Double paymentAmount, Date paymentDate) throws AstuteException;
 
 }
\ No newline at end of file
diff --git a/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java b/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java
index 57527bd..251eaa7 100644
--- a/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java
+++ b/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java
@@ -1,8 +1,6 @@
 package com.astute.dao;
 
 import com.astute.exceptions.AstuteException;
-import com.astute.exceptions.AstuteException;
-
 import com.astute.model.*;
 
 import javax.crypto.SecretKeyFactory;
@@ -13,7 +11,6 @@ import java.security.SecureRandom;
 import java.security.spec.InvalidKeySpecException;
 import java.sql.*;
 import java.util.ArrayList;
-
 import java.util.List;
 import java.util.UUID;
 
@@ -75,7 +72,7 @@ public class SqlDAO extends DAO {
             Statement stmt = conn.createStatement();
             String whereClause = " WHERE ";
             boolean whereClauseCriteria = false;
-            String sql = "SELECT PO_num, line_item_no, service_desc, fee_type_id, qty, service_type_id, get_remaining_qty(PO_num, line_item_no) as get_remaining_qty FROM PO_DETAIL ";
+            String sql = "SELECT PO_num, line_item_no, service_desc, fee_type_id, qty, service_type_id, get_remaining_qty_fun(PO_num, line_item_no) as get_remaining_qty FROM PO_DETAIL ";
             if (PONum != null) {
                 whereClause = whereClause + " UPPER(PO_num) = '" + PONum.toUpperCase() + "'";
                 whereClauseCriteria = true;
@@ -152,7 +149,7 @@ public class SqlDAO extends DAO {
 
     }
 
-    public void updatePODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, int serviceTypeId, String schedule, Date deiverBy) throws AstuteException {
+    public void updatePODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, int serviceTypeId) throws AstuteException {
         try {
             String sql = "UPDATE PO_DETAIL ";
             String updateClause = " SET ";
@@ -177,13 +174,6 @@ public class SqlDAO extends DAO {
             if (serviceTypeId > 0) {
                 updateClause += " service_type_id = " + serviceTypeId + ",";
             }
-            if (schedule != null && !schedule.isEmpty()) {
-                updateClause += " schedule = '" + schedule + "',";
-            }
-            if (deiverBy != null) {
-                updateClause += " deiver_by = " + deiverBy;
-            }
-
             if (!updateClause.equalsIgnoreCase(" SET ")) {
                 sql = sql + trimLastCharacter(updateClause, ",") + whereClause;
 
@@ -214,19 +204,17 @@ public class SqlDAO extends DAO {
         }
     }
 
-    public void createPODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, int serviceTypeId, String schedule, Date deiverBy) throws AstuteException {
+    public void createPODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, int serviceTypeId) throws AstuteException {
         try {
             System.out.println("Calling create_po_detail Procedure");
             System.out.println("POnum is " + POnum);
-            CallableStatement stmt = conn.prepareCall("{call create_po_detail(?,?,?,?,?,?,?,?)}");
+            CallableStatement stmt = conn.prepareCall("{call create_po_detail(?,?,?,?,?,?)}");
             stmt.setString(1, POnum);
             stmt.setInt(2, lineItemNo);
             stmt.setString(3, serviceDesc);
             stmt.setInt(4, feeTypeId);
             stmt.setDouble(5, qty);
             stmt.setInt(6, serviceTypeId);
-            stmt.setString(7, schedule);
-            stmt.setDate(8, deiverBy);
             stmt.executeUpdate();
         } catch (SQLException e) {
             e.printStackTrace();