The first thing I did was upgrade the RAM though. Now it has 36GB. I recommend you max out the RAM as much as possible, you won't regret it.
That's why I only look for 16GB options, and not 8GB. There are a few configurations that have two slots of memory, to upgrade it further if I need it.