Potential implementation for #3