Edited the structure