Updated some cycle conditions