Added Loop management

14/05/2014