More general approach regarding that last commit