Modified toolkit just a little bit.