updates based on latest changes