Changes and little debug