Fixed and Improved recursion methods
Merge branch 'SUBS'