Rearranged order or content, removed ward map