Performance enhancements (small tweaks to improve shape and accuracy)