trying to fix this.. will come back to it later