change design + add modify