Modify some design to match our product