Updated with new fifi and sak functions