Palace Placement things
Merge Conflict
merged