Hardcoded part replaced