Redesign to make it more compact.