Final change for v6 release :)