i am tom
merge & fix new