Got rid of the old static values