Worked on #16, changed some variable names