More changes as per my setup.