Updated to match relaxed restrictions in Decoder