take over changes by @acpi