yes, and yes (I assume you meant "...we need to do a better...")