switched out some hard-coded values for constants