Update encoder + optim + wider