Last changes on formating