[TASK] Improve FAL performance