Incorporating latest updates from Alex D.