refacted a lot, update formations
uh
merged