thesis done yet, need some remend