Add support for two squares in combined