v 1.2.1 - some changes