Removed hardcoded values