Put Henk's part about squares in