Complete - task : make expandable