Updated select and expand method