0.4.0+2, fine tune