More AIFF work