updated with first cut