removed hardcodded parameters