changed target block to use the new base class