removed the hardcoded values