Added manual Recursion
merged features, fixed merge conflicts