encoding change + removed todo part