Updates shaping and some improvement