Added more repeating logic