updated version of both