Fence shit
merged refactoring