Reworked method