fixed class to work better, I wonder if doing it this way would help the
csr interface.