minor refactoring, and put version to concrete 0.21 version