Trigger improvemetns