some variables forgot to change