updated hardware
fix mapping mechanisms.