temporary, still debugging and fixing