Use updated method