Hardcode eliminated