Last changes for the writer
Added some modifications