Fixed the hardcoded values