endless loop added