change 'target' to 'object' up to the end of Sec2.3