CDCE works great now, improved register mapping