added changes suggested by JB