Issue #1: Fixed all major parts for nesting.