hopefully final changes made