I've optimized my older design to be more compact.