Implemented #62 point 2. 30+s --> 4.1s