Work in progress related to FAL integration