Latest updates. Need to figure out how to handle certain situations.