Feature/add good format