Modified toolkits