The new disign and some minor changes