Updated Rom-Control stuff