Yet again changed OS and updated Support and CommandListener