added active switch and optional PUTs in Reviewer