Attempting to remove hard coded values