incorporated more changes from our existing guide