Added enhance block with latch