getting ready for final changes