Remapped to match physical layout
Removed cruft