Trying out pockets
Improving border assembly