Updated fort Mambu 3.6 - review comments