removed hardcoded part