Made splash more efficient