Am also thinking about upgrading...