end cores more gracefully