Updated register stuff