Yep, a better approach here as well,