Did almost all final changes