Fixed scoping errors
Reverted feature return