minor experimental changes