Some debug, some new feature ?? :P