Agree with both of these suggestions