Format redone with some new stuff!