Re-implemented method version