New version of the decode
Re-add decode