Update to s3.2 and make changes to x/y layout