modified to work with new interest storage strucure