Manually updated version