post-meeting with Alex changes
trying to merge