a few modifications in decoding, body and main files