Enhances #2