trying to fix mapping