Finally decided to upgrade my setup