Updates and bug fixes + Concurrent controller