minor changes in mapping