more debug removed