Finally got case collapsing to function properly on both levels