removed delates since it breaks if value is nil