revised with Team OCtOS pull requests