Third draft, it looks (kinda) like it did before