Little refactoring, amount to invest depends now on how good is the market