updated hardcoded