Updated to reflect latest size optimizations