re-organized abit