merged Monday's changes with Bob to development branch