preparing for a 1.7 push! (this may end up just being temporary...)