design + fix