Changed to use jQuery more