toolkit changes