updated foma stuff