Fixed circular dependencies, fixed box output