Updates suggested by @jdevera