Updated to faster