Jake's updated version