add 6 and 7, plus lib for common stuff