Restructured and tested