updates based on PR