align to newest redefine needs
0.1.0
tidy up