Added LL proposals
Renamed to fit GBES proposals
small fixes from NPOL