Merge Nayong's changes