finalize
change design
fix