upgrade to 2.9.2, removing some hard coding