need to fix mapping