Updated according to Steven, May and Matthew comments.