Sync attemp

A mixup in the commits caused a conflict. Trying to resolve it.