Tweak design and improve performance