did a lot of changes for systemd