FixShape first version finish..