Small rewrite and it's still desyncing