[UPDATE] Adding timer as a trigger