better format and a few features