diff --git a/docs/Instruction/images/T-shirts_grad.jpg b/docs/Instruction/images/T-shirts_grad.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..b89590123fad476e47f6cb068483875919491e8b
Binary files /dev/null and b/docs/Instruction/images/T-shirts_grad.jpg differ
diff --git a/docs/Instruction/images/T-shirts_press.jpg b/docs/Instruction/images/T-shirts_press.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..04b969a4c9206e79740e67af66b3bd3174cb623d
Binary files /dev/null and b/docs/Instruction/images/T-shirts_press.jpg differ
diff --git a/docs/Instruction/tips_list.md b/docs/Instruction/tips_list.md
index 4b0f86b34bcf13c498e773cae604ff1647392368..8ddc02560a35c5c8b38353450ad4516378effac0 100644
--- a/docs/Instruction/tips_list.md
+++ b/docs/Instruction/tips_list.md
@@ -1,7 +1,11 @@
# Tips list
## Markdown
+- [Markdown memo (w/Mkdocs-material template)](http://tatsuro.homma.fabcloud.io/fabacademy/tips/content/markdown/)
- [Make this site](./tips/make_this_site.md)
+## 3D CAD
+- [Blender Physics](http://yuichitamiya.fabcloud.io/fabacademy2020/projects/blender_physics/)
+
## Other Tips list
- [Tips List 2021](http://academany.fabcloud.io/fabacademy/2021/labs/kannai/site/instruction/tips_list/)
diff --git a/docs/Instruction/week01.md b/docs/Instruction/week01.md
index fd866141a7ac582c6d11a6c86f20a802152b300b..ebdf0af023d63ae30325e1e125216c0648893f8e 100644
--- a/docs/Instruction/week01.md
+++ b/docs/Instruction/week01.md
@@ -285,3 +285,9 @@ Tips 2020 [ffmpeg example](https://fabacademy.org/2020/labs/kannai/students/tats
#### imagemagic
[site](https://imagemagick.org/)
+
+## The Fab Charter
+
+!!! Attention
+ The Fab Charter
+ https://fab.cba.mit.edu/about/charter/
diff --git a/docs/Instruction/week02.md b/docs/Instruction/week02.md
index 28f7c75e5f70c7ec057a668889f9b98dd56e5238..baa910448007bd758f5a1de0ee030398314ec392 100644
--- a/docs/Instruction/week02.md
+++ b/docs/Instruction/week02.md
@@ -1,61 +1,107 @@
# 2. Computer Aided design
-This week I worked on defining my final project idea and started to getting used to the documentation process.
+## The Fab Charter
+https://fab.cba.mit.edu/about/charter/
-## Research
+## CAD licenses
-"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+- Solidworks -> gone out
+- xDesign -> gone out
+- Fusion360 -> coming
+- OnShape -> created (check email)
-> "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+## Markdown
-## Useful links
+- [Tips](http://tatsuro.homma.fabcloud.io/fabacademy/tips/content/markdown/)
+- [Layout](https://fabacademy.org/2022/labs/kannai/students/yukiya-yamane/)
-- [Jekyll](http://jekyll.org)
-- [Google](http://google.com)
-- [Markdown](https://en.wikipedia.org/wiki/Markdown)
+## Preparation for next week
+> **Computer-Controlled Cutting**
+> individual assignment:
+> cut something on the vinylcutter
-## Code Example
+ - vinylcutter
+ - sand blast > Glass
+ - Ref. [last year](https://fabacademy.org/2021/labs/kannai/students/natsuka-kamei/week3.html)
+ - heat press > T-shirt
+ - [Pressing](./images/T-shirts_press.jpg)
+ - [Graduation](./images/T-shirts_grad.jpg)
-Use the three backticks to separate code.
+> design, lasercut, and document a parametric construction kit
-```
-// the setup function runs once when you press reset or power the board
-void setup() {
- // initialize digital pin LED_BUILTIN as an output.
- pinMode(LED_BUILTIN, OUTPUT);
-}
-
-// the loop function runs over and over again forever
-void loop() {
- digitalWrite(LED_BUILTIN, HIGH); // turn the LED on (HIGH is the voltage level)
- delay(1000); // wait for a second
- digitalWrite(LED_BUILTIN, LOW); // turn the LED off by making the voltage LOW
- delay(1000); // wait for a second
-}
-```
+- Design
+ - well Prepared -> your original
+ - if not -> simple
+
+## (Individual) Assignment
+
+> model (raster, vector, 2D, 3D, render, animate, simulate, ...) a possible final project,
+compress your images and videos,
+and post a description with your design files on your class page
+
+#### Have you answered these questions?
-## Gallery
+[Assesment](https://fabacademy.org/2022/nueval/computer-aided_design.html)
-
+- Modelled experimental objects/part of a possible project in 2D and 3D software
+- Shown how you did it with words/images/screenshots
+- Included your original design files
-## Video
-### From Vimeo
+## ToDo
-<iframe src="https://player.vimeo.com/video/10048961" width="640" height="480" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
-<p><a href="https://vimeo.com/10048961">Sound Waves</a> from <a href="https://vimeo.com/radarboy">George Gally (Radarboy)</a> on <a href="https://vimeo.com">Vimeo</a>.</p>
+### 2D design
-### From Youtube
+- Raster
+ - [GIMP](https://www.gimp.org/)
+ - Photoshop
-<iframe width="560" height="315" src="https://www.youtube.com/embed/jjNgJFemlC4" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+- vector
+ - [Inkscape](https://inkscape.org/)
+ - Illustrator
+ - CorelDRAW
-## 3D Models
+### 3D design
+- Fusion360 -> parametric design
+- [OnShape](https://www.onshape.com/en/)
+ - create account link in the email
+- [Blender](https://www.blender.org/)
+ - [Wakayama Univ](https://drive.google.com/file/d/1m2lOC0plHx6fswb_4jUQ_SRqHF8zOAIW/view?usp=sharing)
+- ZBrush
+ - [ZBrushCoreMini](https://pixologic.jp/zbrushcoremini-download/)
+ - ref. [article](https://cginterest.com/2020/06/11/zbrush-%E3%81%AB%E7%84%A1%E6%96%99%E7%89%88%E3%81%AE%E3%80%8Czbrush-core-mini%E3%80%8D%E3%81%8C%E7%99%BB%E5%A0%B4%EF%BC%81/)
+ - [ZBrush Core Mini Tutorial for Absolute Beginners](https://www.youtube.com/watch?v=Jdm3JxvCu-Q)
+ - [ZBrushCoreMini ã®ä½¿ã„æ–¹](https://oakcorp.net/pixologic/mini/howto/)
+- SolidWorks
+ - installed in PC in FabLab Kannai
-<div class="sketchfab-embed-wrapper"><iframe width="640" height="480" src="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915/embed" frameborder="0" allow="autoplay; fullscreen; vr" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe>
+### Render
+- Fusion360
+- Blender
-<p style="font-size: 13px; font-weight: normal; margin: 5px; color: #4A4A4A;">
- <a href="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Dita's Gown</a>
- by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a>
- on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a>
-</p>
-</div>
+### Animate
+- Fusion360
+
+### Simulation
+- Blander Physics
+ - [Manual](https://docs.blender.org/manual/en/latest/physics/index.html)
+ - [video](http://academy.cba.mit.edu/classes/interface_application_programming/physics.mp4)
+ - [Blender Physics](http://yuichitamiya.fabcloud.io/fabacademy2020/projects/blender_physics/)
+
+### compress images and videos
+
+- [imagemagick](https://imagemagick.org/index.php)
+ - [encoding](http://academy.cba.mit.edu/classes/computer_design/image.html)
+```
+convert PNG to JPG:
+ convert input.png output.jpg
+convert all PNGs to JPGs:
+ mogrify -format jpg *.png
+convert SVG to PNG at 1000 DPI:
+ convert -density 1000 -units PixelsPerInch input.svg output.png
+compress JPG to quality 50% width 1000:
+ convert input.jpg -quality 50% -resize 1000 output.jpg
+compress all JPGs to quality 50% width 1000:
+ mogrify -quality 50% -resize 1000 *.jpg
+```
+- ffmpeg