Updated to square pads, to squeeze out some more land area