Looks good. I would just add a comment that the conditional is for GAE.