Probably a better approach