Updated structure. Not working now !