redesign for 0.4.0