Restructured + work on edit