updated to be minimal toolkit