feedback added - modifications