removed hardcoded data