removed hardcoded params