Increased size, some tweaking still required