more debug remove changes