Added changes and restored structure