Changed decoder, add train