V.0.1.22 - some modification to previous commit