#19 removed total, fixed amount calculation [t: 0:19]