Added check for NONE to many of the values