Yes, do both of these things.