Task4

4_6 bug fixing
4_5 bug fixing