Updated with OSULP Modifications