Added feature to not repeat until messages have been sent