Update in preperation for 3.1