Improve shape