fixing lection 23
fixing lection 24
fixing lection 25