v0.4.0: + modularization; * then -> always