Update to condensed method (tested)