changes based on PR mistakes found