* tighten up lib