Improved paddle handling