Restructure added redundancy