Feature/add good tools