Testing branch again.
made a chage to leights 1051
fixed conflict in Thread_test 1054