Added debug-code