Changed values over to the constants