Further work on expand