added new version to use all tools correctly...