Comments from aubree joseph (@AubreeJoseph)