made some changes related to setting Amount values