made changes because hard coded values are bad