Removed hard-coded vlaues