Update evia's code for references