Maybe consider removing INTEREST, I don't think we'll ever change it and it makes the code more difficult to understand