Please include with any other refactoring you have, thanks.