Minor Changes ... Need to check triggerWatch especially the second if and the last return null