Working version of the toolkit