fixing the hardcoded values