Updating with my current setup