Refactored like suggested; removed BC break