updating for 1.7x