some checking for nil data, and re-enabled happy pour