Hardcoded values removed.