Modification on Emma post.