kq added changes since Shan lost his computer