Updated self-hosting 3