commit 3

Easy and medium done