some minor changes
recipe 2 conflict resolved