Add final, nearly, changes