Added in bool valid