Done what I suggested above