added ends_at CS20 back in. fixes #17