fixed: looping
added: new features