Changed paramter names and values. Changed the mappings