Reordered plugins, added repeat