added lib and extras