fixed mapping, etc.
updated version