I changed all the implementation of this. I think there were 3 of them