Updating Jon Chan clock to fix a bug and update with PANDA CHAN