New commit (Single instance and more)
Args updates