still updating stuff for combo