Check and Giveup actions updated based on new requirement  - Bug 2006