Yes to both, I'll edit that in.