Got rid of if statements, adding just values