Speed improvements

Doesn't change borders anymore
Mergey merge