Fixing and improving pre formatting + field mapping system