still fixing those equals