updated to take account of "proper" image location