Improved climbing logic