wip for 0.4.1