Changes according to message from jrjohansson May 28