Updated to show latest changes