more changes for watered down version