Addressed comments by @jnwng