redesigning and fixing