[SQUASH ME] Addressed @OlegHahm's remarks