modified decoding, field and main files