With end circle too