[ADDED] More checks for amounts