Try to eliminate hard coded values..