Rewrite to use new object