* final changes