Added formations and more updates