Removed dp_hardcode