first cut for the updated version