Changed checking for amounts