started final changes