Restructured and added