Change pass-set to use timer module