old changes in hotfix-0.0.2 branch