updated to work with FA 7.8