Adaptions for 6.2