removed hardcoded values