More modifications for FAL