trying to fix nesting