Removed hard-coding.