Improve LAF