V.0.1.23 - some new modification to previous commit