Split up shape tools & removed attachment tools