Updated faster version