Working on restructuring
Update