name refactoring
temporary decoder code