Lot of changes with encoding