changed logic to reflect NoneValue