Modified endpoint names
Added 'infinite loop' endpoint