Pull latest updates from xinzh

Pull xinzh updates back to Mostafa's repo