Better but not perfect ...