final changes, unable to correct warnings