This is the updated version for the prototype