would that solve both of these issues?