Upgraded setup , tell me what to improve