Updates to fix decoder