My fifth commit
-some optimization of code
-some bugs were fixed