some changes to create tool