Whee final changes