removed hash stuff to refactor