No longer uses hardcoded values