Need to upgrade and need some advice from you clever lot