Small changes as per discussion.