updated with toolsFolder TODO