Improved leaves module