normal register system and some layout changes