Updated to F3 Version 3-1-1