TARGET: review scope of functions