2014 merge w Luo work

is this the most up to date version?
tt

tt