get TEB process working
merge conflicts