added all but the rename of the variables