preparing to merge with 0.4