need advice on what to change / upgrade