Added working decoder