Fix ordering and add fvda