[UPDATES] Fixed combo features