Changes to clarify per conversation with PMs