Rewrite, more RDP compiler style