syncing with havoc_platform