Issue: 16 - Small change adds up