updated africom
committing merge