update to final changes