Many changes

AL & MF working together