Mostly changes inspired by Ghost Control: Reconstructed