Looks good

2nd PR.