filtering by cycle works now (hopefully)
resolve merge conflicts