Personal Changes to LS frameworks_base