testing and fixing