Updated for spspeedy