Correction on trigger and is valid methods
Enhancement