Removed header for testing purpose
Added debug code