My updated version