UPDATE: rename some variables